diff --git a/ChangeLog b/ChangeLog
index 069797018..8e5a7dee8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -53,6 +53,8 @@
 	* added more detailed instrumentation of the disk I/O thread
 
 
+	* fixed file allocation issues on linux
+	* fixed filename encoding and decoding issue on platforms using iconv
 	* reports redundant downloads to tracker, fixed downloaded calculation to
 	  be more stable when not including redundant. Improved redundant data accounting
 	  to be more accurate
diff --git a/src/escape_string.cpp b/src/escape_string.cpp
index 040024de5..8559d80b3 100644
--- a/src/escape_string.cpp
+++ b/src/escape_string.cpp
@@ -658,7 +658,9 @@ namespace libtorrent
 		if (insize != 0) return s;
 		// not sure why this would happen, but it seems to be possible
 		if (outsize > s.size() * 4) return s;
-		ret.resize(outsize);
+		// outsize is the number of bytes unused of the out-buffer
+		TORRENT_ASSERT(ret.size() >= outsize);
+		ret.resize(ret.size() - outsize);
 		return ret;
 	}
 
diff --git a/src/file.cpp b/src/file.cpp
index 4732eac83..b0842e2a9 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -1522,7 +1522,7 @@ namespace libtorrent
 			}
 		}
 #endif // _WIN32_WINNT >= 0x501
-#else
+#else // NON-WINDOWS
 		struct stat st;
 		if (fstat(m_fd, &st) != 0)
 		{
@@ -1570,7 +1570,7 @@ namespace libtorrent
 			// way. If fallocate failed with some other error, it
 			// probably means the user should know about it, error out
 			// and report it.
-			if (errno != ENOSYS)
+			if (errno != ENOSYS && errno != EOPNOTSUPP)
 			{
 				ec.assign(errno, get_posix_category());
 				return false;
@@ -1583,7 +1583,9 @@ namespace libtorrent
 			// if you get a compile error here, you might want to
 			// define TORRENT_HAS_FALLOCATE to 0.
 			ret = posix_fallocate(m_fd, 0, s);
-			if (ret != 0)
+			// posix_allocate fails with EINVAL in case the underlying
+			// filesystem does bot support this operation
+			if (ret != 0 && ret != EINVAL)
 			{
 				ec.assign(ret, get_posix_category());
 				return false;
diff --git a/test/test_storage.cpp b/test/test_storage.cpp
index c06197acb..46a857966 100644
--- a/test/test_storage.cpp
+++ b/test/test_storage.cpp
@@ -442,11 +442,14 @@ void run_storage_tests(boost::intrusive_ptr<torrent_info> info
 	TORRENT_ASSERT(fs.num_files() > 0);
 	error_code ec;
 	create_directory(combine_path(test_path, "temp_storage"), ec);
-	if (ec) std::cerr << "create_directory: " << ec.message() << std::endl;
+	if (ec) std::cerr << "create_directory '" << combine_path(test_path, "temp_storage")
+		<< "': " << ec.message() << std::endl;
 	remove_all(combine_path(test_path, "temp_storage2"), ec);
-	if (ec) std::cerr << "remove_all: " << ec.message() << std::endl;
+	if (ec) std::cerr << "remove_all '" << combine_path(test_path, "temp_storage2")
+		<< "': " << ec.message() << std::endl;
 	remove_all(combine_path(test_path, "part0"), ec);
-	if (ec) std::cerr << "remove_all: " << ec.message() << std::endl;
+	if (ec) std::cerr << "remove_all '" << combine_path(test_path, "part0")
+		<< "': " << ec.message() << std::endl;
 
 	int num_pieces = fs.num_pieces();
 	TEST_CHECK(info->num_pieces() == num_pieces);
@@ -597,9 +600,11 @@ void run_storage_tests(boost::intrusive_ptr<torrent_info> info
 	io.abort();
 	io.join();
 	remove_all(combine_path(test_path, "temp_storage2"), ec);
-	if (ec) std::cerr << "remove_all: " << ec.message() << std::endl;
+	if (ec) std::cerr << "remove_all '" << combine_path(test_path, "temp_storage2")
+		<< "': " << ec.message() << std::endl;
 	remove_all(combine_path(test_path, "part0"), ec);
-	if (ec) std::cerr << "remove_all: " << ec.message() << std::endl;
+	if (ec) std::cerr << "remove_all '" << combine_path(test_path, "part0")
+		<< "': " << ec.message() << std::endl;
 	}
 	page_aligned_allocator::free(piece);
 }
@@ -609,7 +614,8 @@ void test_remove(std::string const& test_path, bool unbuffered)
 	file_storage fs;
 	error_code ec;
 	remove_all(combine_path(test_path, "temp_storage"), ec);
-	if (ec) std::cerr << "remove_all: " << ec.message() << std::endl;
+	if (ec) std::cerr << "remove_all '" << combine_path(test_path, "temp_storage")
+		<< "': " << ec.message() << std::endl;
 	TEST_CHECK(!exists(combine_path(test_path, "temp_storage")));	
 	fs.add_file("temp_storage/test1.tmp", 8);
 	fs.add_file("temp_storage/folder1/test2.tmp", 8);
@@ -640,6 +646,9 @@ void test_remove(std::string const& test_path, bool unbuffered)
 
 	// allocate the files and create the directories
 	s->initialize(true);
+	TEST_CHECK(!s->error());
+	if (s->error())
+		fprintf(stderr, "%s: %s\n", s->error().message().c_str(), s->error_file().c_str());
 
 	TEST_CHECK(exists(combine_path(test_path, "temp_storage/_folder3/subfolder/test5.tmp")));	
 	TEST_CHECK(exists(combine_path(test_path, "temp_storage/folder2/test3.tmp")));	
@@ -677,7 +686,8 @@ void test_check_files(std::string const& test_path
 	error_code ec;
 	const int piece_size = 16 * 1024;
 	remove_all(combine_path(test_path, "temp_storage"), ec);
-	if (ec) std::cerr << "remove_all: " << ec.message() << std::endl;
+	if (ec) std::cerr << "remove_all '" << combine_path(test_path, "temp_storage")
+		<< "': " << ec.message() << std::endl;
 	file_storage fs;
 	fs.add_file("temp_storage/test1.tmp", piece_size);
 	fs.add_file("temp_storage/test2.tmp", piece_size * 2);
@@ -748,7 +758,8 @@ void run_test(std::string const& test_path, bool unbuffered)
 	{
 	error_code ec;
 	remove_all(combine_path(test_path, "temp_storage"), ec);
-	if (ec) std::cerr << "remove_all: " << ec.message() << std::endl;
+	if (ec) std::cerr << "remove_all '" << combine_path(test_path, "temp_storage")
+		<< "': " << ec.message() << std::endl;
 	file_storage fs;
 	fs.add_file("temp_storage/test1.tmp", 17);
 	fs.add_file("temp_storage/test2.tmp", 612);
@@ -782,7 +793,8 @@ void run_test(std::string const& test_path, bool unbuffered)
 	TEST_EQUAL(file_size(combine_path(base, "test6.tmp")), 841);
 	TEST_EQUAL(file_size(combine_path(base, "test7.tmp")), last_file_size - piece_size);
 	remove_all(combine_path(test_path, "temp_storage"), ec);
-	if (ec) std::cerr << "remove_all: " << ec.message() << std::endl;
+	if (ec) std::cerr << "remove_all '" << combine_path(test_path, "temp_storage")
+		<< "': " << ec.message() << std::endl;
 	}
 
 // ==============================================
@@ -807,7 +819,8 @@ void run_test(std::string const& test_path, bool unbuffered)
 
 	TEST_EQUAL(file_size(combine_path(test_path, "temp_storage/test1.tmp")), piece_size * 3);
 	remove_all(combine_path(test_path, "temp_storage"), ec);
-	if (ec) std::cerr << "remove_all: " << ec.message() << std::endl;
+	if (ec) std::cerr << "remove_all '" << combine_path(test_path, "temp_storage")
+		<< "': " << ec.message() << std::endl;
 
 // ==============================================
 
@@ -819,7 +832,8 @@ void run_test(std::string const& test_path, bool unbuffered)
 	TEST_EQUAL(file_size(combine_path(test_path, "temp_storage/test1.tmp")), 3 * piece_size);
 
 	remove_all(combine_path(test_path, "temp_storage"), ec);
-	if (ec) std::cerr << "remove_all: " << ec.message() << std::endl;
+	if (ec) std::cerr << "remove_all '" << combine_path(test_path, "temp_storage")
+		<< "': " << ec.message() << std::endl;
 
 	}
 
@@ -840,9 +854,11 @@ void test_fastresume(std::string const& test_path)
 	error_code ec;
 	std::cout << "\n\n=== test fastresume ===" << std::endl;
 	remove_all(combine_path(test_path, "tmp1"), ec);
-	if (ec) std::cerr << "remove_all: " << ec.message() << std::endl;
+	if (ec) std::cerr << "remove_all '" << combine_path(test_path, "tmp1")
+		<< "': " << ec.message() << std::endl;
 	create_directory(combine_path(test_path, "tmp1"), ec);
-	if (ec) std::cerr << "create_directory: " << ec.message() << std::endl;
+	if (ec) std::cerr << "create_directory '" << combine_path(test_path, "tmp1")
+		<< "': " << ec.message() << std::endl;
 	std::ofstream file(combine_path(test_path, "tmp1/temporary").c_str());
 	boost::intrusive_ptr<torrent_info> t = ::create_torrent(&file);
 	file.close();
@@ -910,7 +926,8 @@ void test_fastresume(std::string const& test_path)
 		TEST_CHECK(dynamic_cast<fastresume_rejected_alert*>(a.get()) != 0);
 	}
 	remove_all(combine_path(test_path, "tmp1"), ec);
-	if (ec) std::cerr << "remove_all: " << ec.message() << std::endl;
+	if (ec) std::cerr << "remove_all '" << combine_path(test_path, "tmp1")
+		<< "': " << ec.message() << std::endl;
 }
 
 bool got_file_rename_alert(alert* a)
@@ -924,7 +941,8 @@ void test_rename_file_in_fastresume(std::string const& test_path)
 	error_code ec;
 	std::cout << "\n\n=== test rename file in fastresume ===" << std::endl;
 	remove_all(combine_path(test_path, "tmp2"), ec);
-	if (ec) std::cerr << "remove_all: " << ec.message() << std::endl;
+	if (ec) std::cerr << "remove_all '" << combine_path(test_path, "tmp2")
+		<< "': " << ec.message() << std::endl;
 	create_directory(combine_path(test_path, "tmp2"), ec);
 	if (ec) std::cerr << "create_directory: " << ec.message() << std::endl;
 	std::ofstream file(combine_path(test_path, "tmp2/temporary").c_str());
@@ -997,7 +1015,8 @@ void test_rename_file_in_fastresume(std::string const& test_path)
 	resume.print(std::cout);
 #endif
 	remove_all(combine_path(test_path, "tmp2"), ec);
-	if (ec) std::cerr << "remove_all: " << ec.message() << std::endl;
+	if (ec) std::cerr << "remove_all '" << combine_path(test_path, "tmp2")
+		<< "': " << ec.message() << std::endl;
 }
 
 int test_main()