diff --git a/application/controllers/DatafieldController.php b/application/controllers/DatafieldController.php
index f3967112..afad3171 100644
--- a/application/controllers/DatafieldController.php
+++ b/application/controllers/DatafieldController.php
@@ -19,17 +19,11 @@ class DatafieldController extends ActionController
 
     public function indexAction()
     {
-        $edit = false;
-
-        if ($id = $this->params->get('id')) {
-            $edit = true;
-        }
-
         $form = DirectorDatafieldForm::load()
             ->setDb($this->db());
 
-        if ($edit) {
-            $form->loadObject($id);
+        if ($id = $this->params->get('id')) {
+            $form->loadObject((int) $id);
             $this->addTitle(
                 $this->translate('Modify %s'),
                 $form->getObject()->varname
diff --git a/application/controllers/ImportsourceController.php b/application/controllers/ImportsourceController.php
index 9623b74c..283612b1 100644
--- a/application/controllers/ImportsourceController.php
+++ b/application/controllers/ImportsourceController.php
@@ -284,7 +284,7 @@ class ImportsourceController extends ActionController
             . (int) $source->get('id');
         $this->content()->prepend(
             ImportRowModifierForm::load()->setDb($this->db())
-                ->loadObject($this->params->getRequired('id'))
+                ->loadObject((int) $this->params->getRequired('id'))
                 ->setListUrl($listUrl)
                 ->setSource($source)
                 ->handleRequest()
diff --git a/library/Director/Web/Form/DirectorObjectForm.php b/library/Director/Web/Form/DirectorObjectForm.php
index eb29742a..d1884f84 100644
--- a/library/Director/Web/Form/DirectorObjectForm.php
+++ b/library/Director/Web/Form/DirectorObjectForm.php
@@ -1080,14 +1080,13 @@ abstract class DirectorObjectForm extends DirectorForm
         $class = $this->getObjectClassname();
         if (is_int($id)) {
             $this->object = $class::loadWithAutoIncId($id, $this->db);
+            if ($this->object->getKeyName() === 'id') {
+                $this->addHidden('id', $id);
+            }
         } else {
             $this->object = $class::load($id, $this->db);
         }
 
-        // TODO: hmmmm...
-        if (! is_array($id) && $this->object->getKeyName() === 'id') {
-            $this->addHidden('id', $id);
-        }
 
         return $this;
     }