diff --git a/Engine/source/shaderGen/featureMgr.cpp b/Engine/source/shaderGen/featureMgr.cpp
index e0dca3cfd..764804981 100644
--- a/Engine/source/shaderGen/featureMgr.cpp
+++ b/Engine/source/shaderGen/featureMgr.cpp
@@ -32,7 +32,7 @@
 MODULE_BEGIN( ShaderGenFeatureMgr )
 
    MODULE_INIT_BEFORE( ShaderGen )
-   MODULE_SHUTDOWN_AFTER( Sim ) // allow registered features to be removed before destroying singleton
+   MODULE_SHUTDOWN_AFTER(Scene)
 
    MODULE_INIT
    {
diff --git a/Templates/BaseGame/game/core/clientServer/scripts/client/connectionToServer.tscript b/Templates/BaseGame/game/core/clientServer/scripts/client/connectionToServer.tscript
index 728d3dace..a182ff76a 100644
--- a/Templates/BaseGame/game/core/clientServer/scripts/client/connectionToServer.tscript
+++ b/Templates/BaseGame/game/core/clientServer/scripts/client/connectionToServer.tscript
@@ -71,6 +71,20 @@ function GameConnection::onControlObjectChange(%this)
    //turnOffZoom();
 }
 
+function GameConnection::onConnectionTimedOut(%this)
+{
+   // Called when an established connection times out
+   disconnectedCleanup();
+   MessageBoxOK( "TIMED OUT", "The server connection has timed out.");
+}
+
+function GameConnection::onConnectionDropped(%this, %msg)
+{
+   // Established connection was dropped by the server
+   disconnectedCleanup();
+   MessageBoxOK( "DISCONNECT", "The server has dropped the connection: " @ %msg);
+}
+
 function GameConnection::onConnectionError(%this, %msg)
 {
    // General connection error, usually raised by ghosted objects
diff --git a/Templates/BaseGame/game/data/UI/guis/mainMenu.tscript b/Templates/BaseGame/game/data/UI/guis/mainMenu.tscript
index 71bb01746..ec4fa44f7 100644
--- a/Templates/BaseGame/game/data/UI/guis/mainMenu.tscript
+++ b/Templates/BaseGame/game/data/UI/guis/mainMenu.tscript
@@ -35,6 +35,8 @@ function MainMenuGui::onWake(%this)
    //This will ultimately call MainMenuButtons::onOpen(), so to see where the navigation
    //chain continues, see that function.
    %this.setRootPage(MainMenuButtons);
+   
+   %this.refreshPage();
 }
 
 function MainMenuButtonHolder::onWake(%this)
diff --git a/Templates/BaseGame/game/data/UI/scripts/menuNavigation.tscript b/Templates/BaseGame/game/data/UI/scripts/menuNavigation.tscript
index b33552d40..261bdbb04 100644
--- a/Templates/BaseGame/game/data/UI/scripts/menuNavigation.tscript
+++ b/Templates/BaseGame/game/data/UI/scripts/menuNavigation.tscript
@@ -287,4 +287,18 @@ function UINavigation::getPageCount(%this)
       %count++;
       
    return %count;
-}
\ No newline at end of file
+}
+
+//==============================================================================
+/// Summary:
+/// Force the page to reprocess to ensure it's status is up to date
+function UINavigation::refreshPage(%this)
+{
+   %page = %this.getCurrentPage();
+   if(!isObject(%page))
+      return;
+      
+   if(%page.isMethod("onOpen"))
+      %page.call("onOpen");
+}
+