diff --git a/CMakeLists.txt b/CMakeLists.txt
index fac7bb41ed..45d80d4ac1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -658,6 +658,7 @@ if (NOT WIN32 AND NOT DPKG_PROGRAM AND NOT APPLE)
     INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/omwlauncher" DESTINATION "${BINDIR}" )
     INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/esmtool" DESTINATION "${BINDIR}" )
     INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/mwiniimport" DESTINATION "${BINDIR}" )
+    INSTALL(PROGRAMS "${OpenMW_BINARY_DIR}/opencs" DESTINATION "${BINDIR}" )
 
     # Install icon and .desktop
     INSTALL(FILES "${OpenMW_SOURCE_DIR}/apps/launcher/resources/images/openmw.png" DESTINATION "${ICONDIR}")
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index f9bddf363d..7dc18c6e87 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -212,7 +212,7 @@ void OMW::Engine::addMaster (const std::string& master)
 {
     mMaster.push_back(master);
     std::string &str = mMaster.back();
- 
+
     // Append .esm if not already there
     std::string::size_type sep = str.find_last_of (".");
     if (sep == std::string::npos)
@@ -300,7 +300,7 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     }
 
     mOgre = new OEngine::Render::OgreRenderer;
-    
+
     mOgre->configure(
         mCfgMgr.getLogPath().string(),
         renderSystem,
@@ -342,7 +342,8 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
 
     //Load translation data
     mTranslationDataStorage.setEncoder(mEncoder);
-    mTranslationDataStorage.loadTranslationData(mFileCollections, mMaster[0]);
+    for (size_t i = 0; i < mMaster.size(); i++)
+      mTranslationDataStorage.loadTranslationData(mFileCollections, mMaster[i]);
 
     // Create window manager - this manages all the MW-specific GUI windows
     MWScript::registerExtensions (mExtensions);
diff --git a/components/bsa/bsa_file.cpp b/components/bsa/bsa_file.cpp
index 5e529e18e8..8db4fa8888 100644
--- a/components/bsa/bsa_file.cpp
+++ b/components/bsa/bsa_file.cpp
@@ -23,9 +23,7 @@
 
 #include "bsa_file.hpp"
 
-//#include <stdexcept>
-//#include <cstdlib>
-//#include <cassert>
+#include <stdexcept>
 
 #include "../files/constrainedfiledatastream.hpp"
 
diff --git a/components/nif/nif_file.cpp b/components/nif/nif_file.cpp
index e6d3182eda..58d1bc9b85 100644
--- a/components/nif/nif_file.cpp
+++ b/components/nif/nif_file.cpp
@@ -37,7 +37,7 @@
 
 //TODO: when threading is needed, enable these
 //#include <boost/mutex.hpp>
-//#include <boost/thread/locks.hpp>
+#include <boost/thread/locks.hpp>
 
 namespace Nif
 {
diff --git a/credits.txt b/credits.txt
index 936f3efd9b..5c966d86b2 100644
--- a/credits.txt
+++ b/credits.txt
@@ -16,6 +16,7 @@ Alexander Olofsson (Ace)
 Artem Kotsynyak (greye)
 athile
 BrotherBrick
+Chris Robinson
 Cory F. Cohen (cfcohen)
 Cris Mihalache (Mirceam)
 Douglas Diniz (Dgdiniz)