Index: code/trunk/src/modules/overlays/OverlaysPrecompiledHeaders.h
===================================================================
--- code/trunk/src/modules/overlays/OverlaysPrecompiledHeaders.h	(revision 7184)
+++ code/trunk/src/modules/overlays/OverlaysPrecompiledHeaders.h	(revision 7284)
@@ -58,5 +58,5 @@
 ///////////////////////////////////////////
 
-#include "core/Executor.h"     // 13
+#include "core/command/Executor.h"     // 13
 //#include "network/synchronisable/Synchronisable.h" // 13
 //#include "core/XMLPort.h"    // 9
Index: code/trunk/src/modules/overlays/hud/ChatOverlay.cc
===================================================================
--- code/trunk/src/modules/overlays/hud/ChatOverlay.cc	(revision 7184)
+++ code/trunk/src/modules/overlays/hud/ChatOverlay.cc	(revision 7284)
@@ -36,5 +36,5 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/Executor.h"
+#include "core/command/Executor.h"
 
 #include "tools/Timer.h"
@@ -91,5 +91,5 @@
         Timer* timer = new Timer();
         this->timers_.insert(timer); // store the timer in a set to destroy it in the destructor
-        Executor* executor = createExecutor(createFunctor(&ChatOverlay::dropMessage, this));
+        const ExecutorPtr& executor = createExecutor(createFunctor(&ChatOverlay::dropMessage, this));
         executor->setDefaultValues(timer);
         timer->setTimer(this->displayTime_, false, executor, true);
Index: code/trunk/src/modules/overlays/hud/GametypeStatus.cc
===================================================================
--- code/trunk/src/modules/overlays/hud/GametypeStatus.cc	(revision 7184)
+++ code/trunk/src/modules/overlays/hud/GametypeStatus.cc	(revision 7284)
@@ -30,6 +30,6 @@
 
 #include "util/Convert.h"
-#include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
+#include "core/command/ConsoleCommand.h"
 #include "infos/GametypeInfo.h"
 #include "infos/PlayerInfo.h"
@@ -41,6 +41,8 @@
     CreateFactory(GametypeStatus);
 
-    /*static*/ bool GametypeStatus::noCaption_s = false;
-    SetConsoleCommand(GametypeStatus, setGametypeStatus, true);
+    static const std::string __CC_GametypeStatus_name = "GametypeStatus";
+    static const std::string __CC_displayCaption_name = "displayCaption";
+
+    SetConsoleCommand(__CC_GametypeStatus_name, __CC_displayCaption_name, &GametypeStatus::setDisplayCaption);
 
     GametypeStatus::GametypeStatus(BaseObject* creator) : OverlayText(creator)
@@ -49,8 +51,12 @@
 
         this->owner_ = 0;
+        this->bNoCaption_ = false;
+
+        ModifyConsoleCommand(__CC_GametypeStatus_name, __CC_displayCaption_name).setObject(this);
     }
 
     GametypeStatus::~GametypeStatus()
     {
+        ModifyConsoleCommand(__CC_GametypeStatus_name, __CC_displayCaption_name).setObject(0);
     }
 
@@ -64,5 +70,5 @@
             ControllableEntity* ce = this->owner_->getControllableEntity();
 
-            if(GametypeStatus::noCaption_s) // No captions are displayed.
+            if (this->bNoCaption_) // No captions are displayed.
             {
                 this->setCaption("");
@@ -105,7 +111,7 @@
         If true captions are displayed, if false, not.
     */
-    /*static*/ void GametypeStatus::setGametypeStatus(bool bValue)
+    void GametypeStatus::setDisplayCaption(bool bValue)
     {
-        GametypeStatus::noCaption_s = !bValue;
+        this->bNoCaption_ = !bValue;
     }
 
Index: code/trunk/src/modules/overlays/hud/GametypeStatus.h
===================================================================
--- code/trunk/src/modules/overlays/hud/GametypeStatus.h	(revision 7184)
+++ code/trunk/src/modules/overlays/hud/GametypeStatus.h	(revision 7284)
@@ -46,9 +46,9 @@
             virtual void changedOwner();
 
-            static void setGametypeStatus(bool bValue); //!< Toggles whether the gametype status is displayed.
+            void setDisplayCaption(bool bValue); //!< Toggles whether the gametype status is displayed.
 
         private:
             PlayerInfo* owner_;
-            static bool noCaption_s;
+            bool bNoCaption_;
 
     };
