diff --git a/ChangeLog b/ChangeLog
index 72db5dbc5..ab68f0d1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,8 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP
 
+0.16.13 release
+
 	* fix auto-manage issue when pausing session
 	* fix bug in non-sparse mode on windows, causing incorrect file errors to be generated
 	* fix set_name() on file_storage actually affecting save paths
diff --git a/configure.ac b/configure.ac
index 5b450b4ce..4838de575 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,7 @@ AX_PTHREAD()
 LIBS="$PTHREAD_LIBS $LIBS"
 CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
 CC="$PTHREAD_CC"
+CXXFLAGS="$CXXFLAGS -ftemplate-depth=120"
 
 AS_ECHO "Checking for visibility support:"
 AC_CACHE_CHECK([for __attribute__((visibility("hidden")))],
diff --git a/test/Makefile.am b/test/Makefile.am
index c7cb514dc..5377ab2b6 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -120,6 +120,7 @@ libtest_la_SOURCES = main.cpp \
 
 test_file_SOURCES = test_file.cpp
 test_file_storage_SOURCES = test_file_storage.cpp
+test_privacy_SOURCES = test_privacy.cpp
 test_auto_unchoke_SOURCES = test_auto_unchoke.cpp
 test_bandwidth_limiter_SOURCES = test_bandwidth_limiter.cpp
 test_bdecode_performance_SOURCES = test_bdecode_performance.cpp
@@ -139,12 +140,15 @@ test_pe_crypto_SOURCES = test_pe_crypto.cpp
 test_pex_SOURCES = test_pex.cpp
 test_piece_picker_SOURCES = test_piece_picker.cpp
 test_primitives_SOURCES = test_primitives.cpp
+test_read_piece_SOURCES = test_read_piece.cpp
 test_storage_SOURCES = test_storage.cpp
 test_swarm_SOURCES = test_swarm.cpp
 test_rss_SOURCES = test_rss.cpp
+test_ssl_SOURCES = test_ssl.cpp
 test_threads_SOURCES = test_threads.cpp
 test_torrent_SOURCES = test_torrent.cpp
 test_torrent_parse_SOURCES = test_torrent_parse.cpp
+test_tracker_SOURCES = test_tracker.cpp
 test_trackers_extension_SOURCES = test_trackers_extension.cpp
 test_transfer_SOURCES = test_transfer.cpp
 test_upnp_SOURCES = test_upnp.cpp