diff --git a/app/src/Command/DatabaseCommand.php b/app/src/Command/DatabaseCommand.php
index 772b45b86..75749fdc3 100644
--- a/app/src/Command/DatabaseCommand.php
+++ b/app/src/Command/DatabaseCommand.php
@@ -245,7 +245,7 @@ public function execute(Arguments $args, ConsoleIo $io) {
     $toSql = $schema->toSql($conn->getDatabasePlatform());
     
     // SchemaManager provides info about the database
-    $sm = $conn->getSchemaManager();
+    $sm = $conn->createSchemaManager();
     
     // The is the current database representation
     $curSchema = $sm->createSchema();
@@ -282,7 +282,7 @@ public function execute(Arguments $args, ConsoleIo $io) {
           $io->out("Skipping sequence drop");
         } else {
           if($doSQL) {
-            $stmt = $conn->query($sql);
+            $stmt = $conn->executeQuery($sql);
             // $stmt just returns the query string so we don't bother examining it
           }
         }
diff --git a/app/src/Command/TransmogrifyCommand.php b/app/src/Command/TransmogrifyCommand.php
index 73276079d..f20eeafe6 100644
--- a/app/src/Command/TransmogrifyCommand.php
+++ b/app/src/Command/TransmogrifyCommand.php
@@ -487,7 +487,7 @@ public function execute(Arguments $args, ConsoleIo $io) {
       // data here, and also we're executing a maintenance operation (so query
       // optimization is less important)
       $outsql = "ALTER SEQUENCE " . $t . "_id_seq RESTART WITH " . $max;
-      $this->outconn->query($outsql);
+      $this->outconn->executeQuery($outsql);
       
       // Run any post processing functions for the table.
       
diff --git a/app/src/Controller/AppController.php b/app/src/Controller/AppController.php
index 94ef18a9b..3161657bf 100644
--- a/app/src/Controller/AppController.php
+++ b/app/src/Controller/AppController.php
@@ -417,7 +417,7 @@ protected function getPrimaryLink(bool $lookup=false) {
         // Look up the link value to find the related entity
         
         $linkTableName = $this->$modelsName->getPrimaryLinkTableName($this->cur_pl->attr);
-        $linkTable = TableRegistry::get($linkTableName);
+        $linkTable = $this->getTableLocator()->get($linkTableName);
         
         $this->set('vv_primary_link_model', $linkTableName);
         
diff --git a/app/src/Controller/MVEAController.php b/app/src/Controller/MVEAController.php
index c12b60721..a05490bcc 100644
--- a/app/src/Controller/MVEAController.php
+++ b/app/src/Controller/MVEAController.php
@@ -56,11 +56,11 @@ public function beforeRender(\Cake\Event\EventInterface $event) {
       if(!empty($link->value)) {
         $this->set('vv_primary_link_id', $link->value);
         
-        $Names = TableRegistry::get('Names');
+        $Names = $this->getTableLocator()->get('Names');
         
         switch($link->attr) {
           case 'external_identity_role_id':
-            $ExternalIdentityRoles = TableRegistry::get('ExternalIdentityRoles');
+            $ExternalIdentityRoles = $this->getTableLocator()->get('ExternalIdentityRoles');
             $roleEntity = $ExternalIdentityRoles->findById((int)$link->value)->firstOrFail();
             
             // Note this is a string, but vv_person_name is an entity
@@ -68,7 +68,7 @@ public function beforeRender(\Cake\Event\EventInterface $event) {
             $this->set('vv_ei_role_id', $link->value);
             // fall through
           case 'external_identity_id':
-            $ExternalIdentity = TableRegistry::get('ExternalIdentities');
+            $ExternalIdentity = $this->getTableLocator()->get('ExternalIdentities');
             
             // What's the Person ID for the ExternalIdentity?
             $eiId = isset($roleEntity) ? $roleEntity->external_identity_id : $link->value;
@@ -84,7 +84,7 @@ public function beforeRender(\Cake\Event\EventInterface $event) {
             $this->set('vv_person_id', $externalIdentity->person_id);
             break;
           case 'person_role_id':
-            $PersonRoles = TableRegistry::get('PersonRoles');
+            $PersonRoles = $this->getTableLocator()->get('PersonRoles');
             $roleEntity = $PersonRoles->findById((int)$link->value)->firstOrFail();
             // Note this is a string, but vv_person_name is an entity
             $this->set('vv_person_role', $PersonRoles->generateDisplayField($roleEntity));
diff --git a/app/src/Model/Table/ApiUsersTable.php b/app/src/Model/Table/ApiUsersTable.php
index 6c364d3e8..c1b97ce43 100644
--- a/app/src/Model/Table/ApiUsersTable.php
+++ b/app/src/Model/Table/ApiUsersTable.php
@@ -307,7 +307,7 @@ public function validationDefault(Validator $validator): Validator {
     $validator->add('co_id', [
       'content' => ['rule' => 'isInteger']
     ]);
-    $validator->notEmpty('co_id');
+    $validator->notEmptyString('co_id');
     
     $this->registerStringValidation($validator, $schema, 'username', true);