diff --git a/include/libtorrent/alert_manager.hpp b/include/libtorrent/alert_manager.hpp
index cb564b90e..8dfb475ef 100644
--- a/include/libtorrent/alert_manager.hpp
+++ b/include/libtorrent/alert_manager.hpp
@@ -136,8 +136,8 @@ namespace libtorrent {
 			return m_alert_mask;
 		}
 
-		size_t alert_queue_size_limit() const { return m_queue_size_limit; }
-		size_t set_alert_queue_size_limit(size_t queue_size_limit_);
+		int alert_queue_size_limit() const { return m_queue_size_limit; }
+		int set_alert_queue_size_limit(int queue_size_limit_);
 
 		void set_notify_function(boost::function<void()> const& fun);
 
@@ -162,7 +162,7 @@ namespace libtorrent {
 		mutable mutex m_mutex;
 		condition_variable m_condition;
 		boost::uint32_t m_alert_mask;
-		size_t m_queue_size_limit;
+		int m_queue_size_limit;
 
 #ifndef TORRENT_NO_DEPRECATE
 		bool maybe_dispatch(alert const& a);
diff --git a/src/alert_manager.cpp b/src/alert_manager.cpp
index 6d69cd6d2..f75e3f4fb 100644
--- a/src/alert_manager.cpp
+++ b/src/alert_manager.cpp
@@ -168,7 +168,7 @@ namespace libtorrent
 		return !m_alerts[m_generation].empty();
 	}
 
-	size_t alert_manager::set_alert_queue_size_limit(size_t queue_size_limit_)
+	int alert_manager::set_alert_queue_size_limit(int queue_size_limit_)
 	{
 		mutex::scoped_lock lock(m_mutex);
 
diff --git a/test/test_resolve_links.cpp b/test/test_resolve_links.cpp
index c224d04a7..16aa1d7ae 100644
--- a/test/test_resolve_links.cpp
+++ b/test/test_resolve_links.cpp
@@ -87,8 +87,8 @@ int test_main()
 {
 
 #ifndef TORRENT_DISABLE_MUTABLE_TORRENTS
-	std::string path
-		= combine_path("..", "mutable_test_torrents");
+	std::string path = combine_path(parent_path(current_working_directory())
+		, "mutable_test_torrents");
 
 	for (int i = 0; i < sizeof(test_torrents)/sizeof(test_torrents[0]); ++i)
 	{