diff --git a/src/Util/ModulesManager.php b/src/Util/ModulesManager.php
index f0b2aed97b..99b8828f92 100644
--- a/src/Util/ModulesManager.php
+++ b/src/Util/ModulesManager.php
@@ -54,7 +54,7 @@ abstract class ModulesManager
 
             // Register event handlers
             $methods = get_class_methods($class);
-            $events  = F\select($methods, Common::swapArgs('startsWith', 'on'));
+            $events  = F\select($methods, F\partial_right('App\Util\Common::startsWith', 'on'));
             F\map($events,
                   function (string $m) use ($class) {
                       Event::addHandler(substr($m, 2), [$class, $m]);
diff --git a/src/Util/SchemaDefDriver.php b/src/Util/SchemaDefDriver.php
index 5bc085a931..16f4d4392f 100644
--- a/src/Util/SchemaDefDriver.php
+++ b/src/Util/SchemaDefDriver.php
@@ -74,7 +74,8 @@ class SchemaDefDriver extends StaticPHPDriver
         $metadata->setPrimaryTable(['name' => $schema['name'],
             'indexes'                      => self::kv_to_name_col($schema['indexes']),
             'uniqueConstraints'            => self::kv_to_name_col($schema['unique keys']),
-            'options'                      => ['comment' => $schema['description']], ]);
+            'options'                      => ['comment' => $schema['description'] ?? ''],
+        ]);
 
         foreach ($schema['fields'] as $name => $opts) {
             // Convert old to new types