diff --git a/src/Control/Session.php b/src/Control/Session.php
index 0fa9730e9..d9a749577 100644
--- a/src/Control/Session.php
+++ b/src/Control/Session.php
@@ -233,9 +233,7 @@ class Session
         if (self::config()->get('strict_user_agent_check') && isset($this->data['HTTP_USER_AGENT'])) {
             if ($this->data['HTTP_USER_AGENT'] !== $this->userAgent($request)) {
                 $this->clearAll();
-                $this->destroy();
-                $this->started = false;
-                $this->start($request);
+                $this->restart($request);
             }
         }
     }
@@ -248,7 +246,7 @@ class Session
     public function restart(HTTPRequest $request)
     {
         $this->destroy();
-        $this->init($request);
+        $this->start($request);
     }
 
     /**
@@ -376,6 +374,7 @@ class Session
         // http://nz1.php.net/manual/en/function.session-destroy.php
         unset($_SESSION);
         $this->data = null;
+        $this->started = false;
     }
 
     /**
diff --git a/src/Dev/Install/DatabaseAdapterRegistry.php b/src/Dev/Install/DatabaseAdapterRegistry.php
index ae5cbf101..0abce6a23 100644
--- a/src/Dev/Install/DatabaseAdapterRegistry.php
+++ b/src/Dev/Install/DatabaseAdapterRegistry.php
@@ -145,12 +145,8 @@ class DatabaseAdapterRegistry
             $databaseConfig = $config;
         }
         // Search through all composer packages in vendor, updating $databaseConfig
-        foreach (glob(BASE_PATH . '/vendor/*', GLOB_ONLYDIR) as $vendor) {
-            foreach (glob($vendor . '/*', GLOB_ONLYDIR) as $directory) {
-                if (file_exists($directory . '/_configure_database.php')) {
-                    include_once($directory . '/_configure_database.php');
-                }
-            }
+        foreach (glob(BASE_PATH . '/vendor/*/*/_configure_database.php') as $configFile) {
+            include_once $configFile;
         }
         // Update modified variable
         $config = $databaseConfig;
diff --git a/src/ORM/ArrayList.php b/src/ORM/ArrayList.php
index caa139542..d923dda29 100644
--- a/src/ORM/ArrayList.php
+++ b/src/ORM/ArrayList.php
@@ -600,7 +600,7 @@ class ArrayList extends ViewableData implements SS_List, Filterable, Sortable, L
 
         $firstRecord = $this->first();
 
-        return array_key_exists($by, $firstRecord);
+        return is_array($firstRecord) ? array_key_exists($by, $firstRecord) : property_exists($by, $firstRecord);
     }
 
     /**
diff --git a/src/i18n/TextCollection/i18nTextCollector.php b/src/i18n/TextCollection/i18nTextCollector.php
index 287fcbbeb..de9f7210e 100644
--- a/src/i18n/TextCollection/i18nTextCollector.php
+++ b/src/i18n/TextCollection/i18nTextCollector.php
@@ -378,8 +378,8 @@ class i18nTextCollector
             // Merge
             if ($existingMessages) {
                 $entitiesByModule[$module] = array_merge(
-                    $existingMessages,
-                    $messages
+                    $messages,
+                    $existingMessages
                 );
             }
         }