diff --git a/CMakeLists.txt b/CMakeLists.txt
index d997f952..60816439 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,10 @@ else ()
 		add_compile_options(-fsanitize=address,undefined,integer)
 		add_definitions(-DED25519_NO_INLINE_ASM)
 	elseif (NANO_TSAN OR RAIBLOCKS_TSAN)
-		add_compile_options(-fsanitize=thread "-fsanitize-blacklist=${PROJECT_SOURCE_DIR}/tsan_blacklist")
+		add_compile_options(-fsanitize=thread)
+		if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+			add_compile_options("-fsanitize-blacklist=${PROJECT_SOURCE_DIR}/tsan_blacklist")
+		endif()
 		add_definitions(-DED25519_NO_INLINE_ASM)
 	endif()
 
@@ -108,7 +111,10 @@ else ()
 	elseif (NANO_ASAN_INT OR RAIBLOCKS_ASAN_INT)
 		set (PLATFORM_LINK_FLAGS "${PLATFORM_LINK_FLAGS} -fsanitize=address,undefined,integer")
 	elseif (NANO_TSAN OR RAIBLOCKS_TSAN)
-		set (PLATFORM_LINK_FLAGS "${PLATFORM_LINK_FLAGS} -fsanitize=thread -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/tsan_blacklist")
+		set (PLATFORM_LINK_FLAGS "${PLATFORM_LINK_FLAGS} -fsanitize=thread")
+		if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+			set (PLATFORM_LINK_FLAGS "${PLATFORM_LINK_FLAGS} -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/tsan_blacklist")
+		endif()
 	endif()
 endif ()
 
diff --git a/nano/lib/blocks.hpp b/nano/lib/blocks.hpp
index ecba24bc..759f0ba2 100644
--- a/nano/lib/blocks.hpp
+++ b/nano/lib/blocks.hpp
@@ -26,7 +26,7 @@ bool try_read (nano::stream & stream_a, T & value)
 }
 // A wrapper of try_read which throws if there is an error
 template <typename T>
-void read (nano::stream & stream_a, T & value) throw (std::runtime_error)
+void read (nano::stream & stream_a, T & value)
 {
 	auto error = try_read (stream_a, value);
 	if (error)