diff --git a/app/config/bootstrap.php b/app/config/bootstrap.php
index 7316d8f01..074573120 100644
--- a/app/config/bootstrap.php
+++ b/app/config/bootstrap.php
@@ -34,13 +34,14 @@
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Configure\Engine\PhpConfig;
-use Cake\Core\Plugin;
+//use Cake\Core\Plugin;
 use Cake\Database\Type;
 use Cake\Datasource\ConnectionManager;
 use Cake\Error\ErrorHandler;
 use Cake\Http\ServerRequest;
 use Cake\Log\Log;
 use Cake\Mailer\Email;
+use Cake\Mailer\TransportFactory;
 use Cake\Utility\Inflector;
 use Cake\Utility\Security;
 
@@ -151,7 +152,7 @@
 
 Cache::setConfig(Configure::consume('Cache'));
 ConnectionManager::setConfig(Configure::consume('Datasources'));
-Email::setConfigTransport(Configure::consume('EmailTransport'));
+TransportFactory::setConfig(Configure::consume('EmailTransport'));
 Email::setConfig(Configure::consume('Email'));
 Log::setConfig(Configure::consume('Log'));
 // Set the salt based on our local configuration
@@ -222,6 +223,7 @@
  * Plugin::loadAll(); // Loads all plugins at once
  * Plugin::load('Migrations'); //Loads a single plugin named Migrations
  *
+ * XXX plugins are now loaded using Application::addPlugin()
  */
 
 /*
diff --git a/app/config/bootstrap_cli.php b/app/config/bootstrap_cli.php
index 85e119e9e..8f67c453f 100644
--- a/app/config/bootstrap_cli.php
+++ b/app/config/bootstrap_cli.php
@@ -14,7 +14,7 @@
  */
 use Cake\Core\Configure;
 use Cake\Core\Exception\MissingPluginException;
-use Cake\Core\Plugin;
+//use Cake\Core\Plugin;
 
 /**
  * Additional bootstrapping and configuration for CLI environments should
@@ -28,7 +28,7 @@
 // Set logs to different files so they don't have permission conflicts.
 Configure::write('Log.debug.file', 'cli-debug');
 Configure::write('Log.error.file', 'cli-error');
-
+/*
 try {
     Plugin::load('Bake');
 } catch (MissingPluginException $e) {
@@ -36,3 +36,4 @@
 }
 
 Plugin::load('Migrations');
+*/
\ No newline at end of file
diff --git a/app/src/Template/Element/menuUser.ctp b/app/src/Template/Element/menuUser.ctp
index b98b78d63..45df252e4 100644
--- a/app/src/Template/Element/menuUser.ctp
+++ b/app/src/Template/Element/menuUser.ctp
@@ -48,7 +48,7 @@
       <div id="user-panel-user-info">
         <em class="material-icons">person</em>
         <div id="user-panel-cn"><?= $vv_user['username']; ?></div>
-        <div id="user-panel-id"><?php print $this->Session->read('Auth.User.username'); ?></div>
+        <div id="user-panel-id"><?php print $this->getRequest()->getSession()->read('Auth.User.username'); ?></div>
       </div>
     </div>
   </div>
diff --git a/app/src/Template/Layout/default.ctp b/app/src/Template/Layout/default.ctp
index cdb90df2c..c994b02c2 100644
--- a/app/src/Template/Layout/default.ctp
+++ b/app/src/Template/Layout/default.ctp
@@ -77,7 +77,7 @@ if(isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'M
     $bodyClasses = $controller_stripped . ' ' .$action_stripped;
 
     // add further body classes as needed
-    if($this->Session->check('Auth.User') != NULL) {
+    if($this->getRequest()->getSession()->check('Auth.User') != NULL) {
       $bodyClasses .= ' logged-in';
     } else {
       $bodyClasses .= ' logged-out';