diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb4958df3..d58befce8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,7 +178,8 @@ set(OPENMW_LIBS_HEADER)
     
 # Platform specific
 if (WIN32)
-set(PLATFORM_INCLUDE_DIR "platform")
+    set(PLATFORM_INCLUDE_DIR "platform")
+    add_definitions(-DBOOST_ALL_NO_LIB)
 else (WIN32)
 set(PLATFORM_INCLUDE_DIR "")
 endif (WIN32)
@@ -186,10 +187,11 @@ endif (WIN32)
 # Dependencies
 
 find_package(OGRE REQUIRED)
-find_package(Boost REQUIRED COMPONENTS system filesystem program_options)
+find_package(Boost REQUIRED COMPONENTS system filesystem program_options thread)
 find_package(OIS REQUIRED)
 include_directories("."
-    ${OGRE_INCLUDE_DIR} ${OIS_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
+    ${OGRE_INCLUDE_DIR} ${OGRE_INCLUDE_DIR}/Ogre
+    ${OIS_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
     ${PLATFORM_INCLUDE_DIR}
     ${CMAKE_HOME_DIRECTORY}/extern/caelum/include)
 link_directories(${Boost_LIBRARY_DIRS} ${OGRE_LIB_DIR})
diff --git a/apps/clientconsole/CMakeLists.txt b/apps/clientconsole/CMakeLists.txt
index f73610863..f030d9024 100644
--- a/apps/clientconsole/CMakeLists.txt
+++ b/apps/clientconsole/CMakeLists.txt
@@ -1,5 +1,3 @@
-project(clientconsole)
-find_package(Boost REQUIRED COMPONENTS system)
-link_directories(${Boost_LIBRARY_DIRS})
+
 add_executable(clientconsole client.cpp)
 target_link_libraries(clientconsole ${Boost_LIBRARIES})
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 30cae5897..5859d9c0e 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -64,15 +64,15 @@ void OMW::Engine::processCommands()
 
 OMW::Engine::Engine()
 : mDebug (false), mVerboseScripts (false), mNewGame (false), mScriptManager (0),
-  mScriptContext (0)
-{
-    mspCommandServer.reset(
-        new OMW::CommandServer::Server(&mCommandQueue, kCommandServerPort));
+  mScriptContext (0), mEnableCommandServer (false)
+{   
 }
 
 OMW::Engine::~Engine()
 {
-//    mspCommandServer->stop();
+    if (mspCommandServer.get())
+        mspCommandServer->stop();
+
     delete mEnvironment.mWorld;
     delete mEnvironment.mSoundManager;
     delete mEnvironment.mGlobalScripts;
@@ -140,6 +140,11 @@ void OMW::Engine::enableDebugMode()
 {
     mDebug = true;
 }
+
+void OMW::Engine::enableCommandServer()
+{
+    mEnableCommandServer = true;
+}
            
 void OMW::Engine::enableVerboseScripts()
 {
@@ -201,8 +206,14 @@ void OMW::Engine::go()
     MWInput::MWInputManager input(mOgre, mEnvironment.mWorld->getPlayerPos(), mDebug);
 
     // Launch the console server
-    std::cout << "Starting command server on port " << kCommandServerPort << std::endl;
-    mspCommandServer->start();
+    if (mEnableCommandServer)
+    {
+        std::cout << "Starting command server on port " << kCommandServerPort << std::endl;
+        mspCommandServer.reset(new OMW::CommandServer::Server(&mCommandQueue, kCommandServerPort));
+        mspCommandServer->start();
+    }
+    else
+        std::cout << "Command server disabled" << std::endl;
 
     std::cout << "\nStart! Press Q/ESC or close window to exit.\n";
 
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index f0b46c6ab..cf982ad0e 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -52,6 +52,7 @@ namespace OMW
             bool mNewGame;
 
             TsDeque<OMW::Command>                     mCommandQueue;
+            bool                                      mEnableCommandServer;
             std::auto_ptr<OMW::CommandServer::Server> mspCommandServer;
 
             MWWorld::Environment mEnvironment;
@@ -98,6 +99,10 @@ namespace OMW
             /// - non-exclusive input
             void enableDebugMode();
 
+            /// Enable the command server so external apps can send commands to the console.
+            /// Must be set before go().
+            void enableCommandServer();
+
             /// Enable verbose script output
             void enableVerboseScripts();
             
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 70530c2ef..82d69fcd8 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -32,6 +32,7 @@ bool parseOptions (int argc, char**argv, OMW::Engine& engine)
         ( "debug", "debug mode" )
         ( "script-verbose", "verbose script output" )
         ( "new-game", "activate char gen/new game mechanics" )
+        ( "enable-command-server", "turn on the command server" )
         ;
   
     bpo::variables_map variables;
@@ -62,6 +63,9 @@ bool parseOptions (int argc, char**argv, OMW::Engine& engine)
 
     if (variables.count ("new-game"))
         engine.setNewGame();
+
+    if (variables.count("enable-command-server"))
+        engine.enableCommandServer();
         
     return true;
 }
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index 525aef183..5a8294ec9 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -110,7 +110,7 @@ namespace MWScript
     void InterpreterContext::setGlobalLong (const std::string& name, int value)
     {
         // a global long is internally a float.
-        float value2 = value;
+        float value2 = float(value);
 
          mEnvironment.mWorld->getGlobalVariable (name) =
             *reinterpret_cast<Interpreter::Type_Data *> (&value2);    
diff --git a/apps/openmw/mwworld/environment.hpp b/apps/openmw/mwworld/environment.hpp
index b208d95a2..d1771d4ee 100644
--- a/apps/openmw/mwworld/environment.hpp
+++ b/apps/openmw/mwworld/environment.hpp
@@ -16,8 +16,9 @@ namespace MWWorld
     class World;
 
     ///< Collection of script-accessable sub-systems
-    struct Environment
+    class Environment
     {   
+    public:
         Environment() : mWorld (0), mSoundManager (0), mGlobalScripts (0) {}
     
         World *mWorld;
diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp
index 217bff7da..32fd3008f 100644
--- a/apps/openmw/mwworld/world.cpp
+++ b/apps/openmw/mwworld/world.cpp
@@ -99,8 +99,9 @@ namespace MWWorld
             iter->second->show();
 
         // Optionally enable the sky
-//        if (mEnableSky)
-//            mpSkyManager = MWRender::SkyManager::create(renderer.getWindow(), mScene.getCamera());
+        ///\todo FIXME
+        if (false)
+            mSkyManager = MWRender::SkyManager::create(renderer.getWindow(), mScene.getCamera());
         
     }
     
diff --git a/components/esm/loadscpt.hpp b/components/esm/loadscpt.hpp
index 6025e528c..aa189c888 100644
--- a/components/esm/loadscpt.hpp
+++ b/components/esm/loadscpt.hpp
@@ -9,8 +9,9 @@ namespace ESM {
  * Script definitions
  */
 
-struct Script
+class Script
 {
+public:
   struct SCHDstruct
   {
     /* Script name.
diff --git a/components/esm_store/cell_store.hpp b/components/esm_store/cell_store.hpp
index 90cd5d1a6..29ab42fd1 100644
--- a/components/esm_store/cell_store.hpp
+++ b/components/esm_store/cell_store.hpp
@@ -87,7 +87,7 @@ namespace ESMS
     CellRefList<Ingredient, D>        ingreds;
     CellRefList<CreatureLevList, D>   creatureLists;
     CellRefList<ItemLevList, D>       itemLists;
-    CellRefList<Light, D>             lights;
+    CellRefList<ESM::Light, D>        lights;
     CellRefList<Tool, D>              lockpicks;
     CellRefList<Misc, D>              miscItems;
     CellRefList<NPC, D>               npcs;
diff --git a/extern/caelum/CMakeLists.txt b/extern/caelum/CMakeLists.txt
index 4226d8d4a..b95b3fd8c 100755
--- a/extern/caelum/CMakeLists.txt
+++ b/extern/caelum/CMakeLists.txt
@@ -1,7 +1,14 @@
 project(Caelum)
 
+IF(MSVC)
+    add_definitions("-D_SCL_SECURE_NO_WARNINGS /wd4305 /wd4244" )
+ENDIF(MSVC)
+
 ADD_DEFINITIONS(-DCAELUM_LIB)
-INCLUDE_DIRECTORIES( ${CMAKE_HOME_DIRECTORY}/extern/caelum/include )
+INCLUDE_DIRECTORIES( 
+    ${CMAKE_HOME_DIRECTORY}/extern/caelum/include 
+    ${OGRE_INCLUDE_DIR}/Ogre
+    )    
 
 file(GLOB_RECURSE CAELUM_SRC src/*)
 file(GLOB_RECURSE CAELUM_HDR include/*)