diff --git a/Jamfile b/Jamfile
index dc0a558c4..7e5da2f4b 100755
--- a/Jamfile
+++ b/Jamfile
@@ -333,7 +333,7 @@ lib boost_system : : <name>boost_system ;
 
 # openssl on linux/bsd/macos etc.
 lib gcrypt : : <name>gcrypt <link>shared <search>/opt/local/lib ;
-lib crypto : : <name>crypto <link>shared ;
+lib crypto : : <name>crypto <search>/lib ;
 lib ssl : : <name>ssl <link>shared <use>crypto ;
 
 # time functions used on linux require librt
diff --git a/include/libtorrent/session.hpp b/include/libtorrent/session.hpp
index 417c75d67..ecb0ba913 100644
--- a/include/libtorrent/session.hpp
+++ b/include/libtorrent/session.hpp
@@ -160,9 +160,10 @@ namespace libtorrent
 			save_proxy =        0x008,
 			save_i2p_proxy =    0x010,
 			save_encryption_settings = 0x020,
-			save_as_map =       0x040,
+			save_as_map =       0x040
 
 #ifndef TORRENT_NO_DEPRECATE
+			,
 			save_dht_proxy = save_proxy,
 			save_peer_proxy = save_proxy,
 			save_web_proxy = save_proxy,
diff --git a/test/test_threads.cpp b/test/test_threads.cpp
index b92fea06e..4f85f0a9d 100644
--- a/test/test_threads.cpp
+++ b/test/test_threads.cpp
@@ -37,10 +37,10 @@ POSSIBILITY OF SUCH DAMAGE.
 
 using namespace libtorrent;
 
-void fun(condition* s, mutex* m, int i)
+void fun(condition* s, libtorrent::mutex* m, int i)
 {
 	fprintf(stderr, "thread %d waiting\n", i);
-	mutex::scoped_lock l(*m);
+	libtorrent::mutex::scoped_lock l(*m);
 	s->wait(l);
 	fprintf(stderr, "thread %d done\n", i);
 }
@@ -48,7 +48,7 @@ void fun(condition* s, mutex* m, int i)
 int test_main()
 {
 	condition cond;
-	mutex m;
+	libtorrent::mutex m;
 	std::list<thread*> threads;
 	for (int i = 0; i < 20; ++i)
 	{
@@ -58,7 +58,7 @@ int test_main()
 	// make sure all threads are waiting on the condition
 	sleep(10);
 
-	mutex::scoped_lock l(m);
+	libtorrent::mutex::scoped_lock l(m);
 	cond.signal_all(l);
 	l.unlock();