diff --git a/examples/client_test.cpp b/examples/client_test.cpp
index 025d9f611..575c6d0eb 100755
--- a/examples/client_test.cpp
+++ b/examples/client_test.cpp
@@ -163,7 +163,7 @@ int main(int argc, char* argv[])
 	using namespace libtorrent;
 
 	// TEMPORARY
-//	boost::filesystem::path::default_name_check(boost::filesystem::no_check);
+	boost::filesystem::path::default_name_check(boost::filesystem::no_check);
 
 	if (argc < 2)
 	{
diff --git a/include/libtorrent/storage.hpp b/include/libtorrent/storage.hpp
index db40de37b..ab4fa78d4 100755
--- a/include/libtorrent/storage.hpp
+++ b/include/libtorrent/storage.hpp
@@ -294,12 +294,11 @@ namespace libtorrent
 
 		boost::filesystem::path m_save_path;
 
-		// synchronization
-		boost::mutex m_locked_pieces_monitor;
-		boost::condition m_unlocked_pieces;
-		std::vector<bool> m_locked_pieces;
-
 		mutable boost::recursive_mutex m_mutex;
+
+		bool m_allocating;
+		boost::mutex m_allocating_monitor;
+		boost::condition m_allocating_condition;
 	};
 
 }