diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9d55eef..79d0ed21 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ ENDIF ()
 
 link_directories ("${PROJECT_LIBS_DIR}/yaml-cpp/build")
 link_directories ("${PROJECT_LIBS_DIR}/libloadorder/build")
-link_directories ("${PROJECT_LIBS_DIR}/zlib")
+link_directories ("${PROJECT_LIBS_DIR}/zlib/build")
 link_directories ("${PROJECT_LIBS_DIR}/wxWidgets/lib")
 
 # Settings when compiling and cross-compiling on Linux.
@@ -61,7 +61,7 @@ IF (CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
         set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--subsystem,windows")
     ENDIF ()
 
-    set (BOSS_LIBS ${BOSS_LIBS} zlibstatic loadorder yaml-cpp boost_log_setup boost_log boost_locale  boost_thread_win32 boost_chrono boost_date_time boost_filesystem boost_system boost_regex)
+    set (BOSS_LIBS ${BOSS_LIBS} zlibstatic loadorder${PROJECT_ARCH} yaml-cpp boost_log_setup boost_log boost_locale  boost_thread_win32 boost_chrono boost_date_time boost_filesystem boost_system boost_regex)
 ENDIF ()
 
 # Settings when compiling on Windows.
diff --git a/README.md b/README.md
index 27c70b22..769f217d 100644
--- a/README.md
+++ b/README.md
@@ -84,14 +84,17 @@ echo "using gcc : 4.6.3 : i686-w64-mingw32-g++ : <rc>i686-w64-mingw32-windres <a
 ### zlib
 
 ```
-cmake . -DCMAKE_C_FLAGS=-m32 -DPROJECT_ARCH=32 -DCMAKE_TOOLCHAIN_FILE=../BOSSv3/mingw-toolchain.cmake
+mkdir build
+cd build
+cmake .. -DCMAKE_C_FLAGS=-m32 -DPROJECT_ARCH=32 -DCMAKE_TOOLCHAIN_FILE=../BOSSv3/mingw-toolchain.cmake
 make
+cp zconf.h ../zconf.h
 ```
 
 ### yaml-cpp
 
 ```
-cmake .. -DCMAKE_C_FLAGS=-m32 -DPROJECT_ARCH=32 -DCMAKE_TOOLCHAIN_FILE=../BOSSv3/mingw-toolchain.cmake -DBOOST_ROOT=../boost
+cmake . -DCMAKE_C_FLAGS=-m32 -DPROJECT_ARCH=32 -DCMAKE_TOOLCHAIN_FILE=../BOSSv3/mingw-toolchain.cmake -DBOOST_ROOT=../boost
 ```
 
 ### Libloadorder
diff --git a/src/api/api.cpp b/src/api/api.cpp
index 1f915226..cddbca72 100644
--- a/src/api/api.cpp
+++ b/src/api/api.cpp
@@ -591,7 +591,8 @@ BOSS_API unsigned int boss_write_minimal_list (boss_db db, const char * const ou
          << YAML::Key << "plugins" << YAML::Value << temp
          << YAML::EndMap;
 
-    boss::ofstream out(boost::filesystem::path(outputFile));
+    boost::filesystem::path p(outputFile);
+    boss::ofstream out(p);
     if (out.fail())
         return boss_error_invalid_args;
     out << yout.c_str();
diff --git a/src/backend/generators.h b/src/backend/generators.h
index 2572e3c5..64c781e0 100644
--- a/src/backend/generators.h
+++ b/src/backend/generators.h
@@ -509,8 +509,9 @@ namespace boss {
         YAML::Emitter yout;
         yout.SetIndent(2);
         yout << root;
-        
-        boss::ofstream out(boost::filesystem::path(file));
+
+        boost::filesystem::path p(file);
+        boss::ofstream out(p);
         out << yout.c_str();
         out.close();
     }
diff --git a/src/backend/metadata.cpp b/src/backend/metadata.cpp
index 697169c3..f2f28410 100644
--- a/src/backend/metadata.cpp
+++ b/src/backend/metadata.cpp
@@ -257,7 +257,7 @@ namespace boss {
 			
 		// Get data from file contents using libespm. Assumes libespm has already been initialised.
 		boost::filesystem::path filepath = game.DataPath() / n;
-        espm::File file(filepath.string(), game.espm_settings, false, headerOnly);
+        espm::File file(filepath, game.espm_settings, false, headerOnly);
 
 		isMaster = file.isMaster(game.espm_settings);
 		masters = file.getMasters();
diff --git a/src/backend/streams.h b/src/backend/streams.h
index 8c381e83..e5d7eba6 100644
--- a/src/backend/streams.h
+++ b/src/backend/streams.h
@@ -20,6 +20,8 @@
     along with BOSS.  If not, see
     <http://www.gnu.org/licenses/>.
 */
+#ifndef __BOSS_STREAMS__
+#define __BOSS_STREAMS__
 
 #include <boost/iostreams/stream.hpp>
 #include <boost/iostreams/device/file_descriptor.hpp>
@@ -29,3 +31,5 @@ namespace boss {
     typedef boost::iostreams::stream< boost::iostreams::file_descriptor_source > ifstream;
     typedef boost::iostreams::stream< boost::iostreams::file_descriptor > fstream;
 }
+
+#endif
diff --git a/src/gui/editor.cpp b/src/gui/editor.cpp
index d3d03421..cd8d21b5 100644
--- a/src/gui/editor.cpp
+++ b/src/gui/editor.cpp
@@ -27,6 +27,7 @@
 
 #include <algorithm>
 #include <boost/algorithm/string.hpp>
+#include <boost/filesystem.hpp>
 
 using namespace std;
 
@@ -650,7 +651,8 @@ void Editor::OnQuit(wxCommandEvent& event) {
              << YAML::Key << "plugins" << YAML::Value << _editedPlugins
              << YAML::EndMap;
 
-        boss::ofstream out(fs::path(_userlistPath));
+        boost::filesystem::path p(_userlistPath);
+        boss::ofstream out(p);
         out << yout.c_str();
         out.close();
     }