diff --git a/cmake/stlab/development/Clang.cmake b/cmake/stlab/development/Clang.cmake
index 3b843c46..6c14b99b 100644
--- a/cmake/stlab/development/Clang.cmake
+++ b/cmake/stlab/development/Clang.cmake
@@ -1,17 +1,17 @@
-set( stlab_Clang_base_flags -Wall -Werror -ftemplate-backtrace-limit=0 -DBOOST_NO_AUTO_PTR=1 )
-set( stlab_Clang_debug_flags -gdwarf-3 )
-set( stlab_Clang_coverage_flags --coverage )
-set( stlab_Clang_release_flags )
+set(stlab_Clang_base_flags -Wall -Werror -ftemplate-backtrace-limit=0)
+set(stlab_Clang_debug_flags -gdwarf-3)
+set(stlab_Clang_coverage_flags --coverage)
+set(stlab_Clang_release_flags)
 
 string(CONCAT generator
   "${stlab_Clang_base_flags};"
   "$<$<OR:$<CONFIG:DEBUG>,"
-         "$<CONFIG:RELWITHDEBINFO>>:${stlab_Clang_debug_flags};>"
+  "$<CONFIG:RELWITHDEBINFO>>:${stlab_Clang_debug_flags};>"
   "$<$<OR:$<CONFIG:RELEASE>,"
-         "$<CONFIG:RELWITHDEBINFO>,"
-         "$<CONFIG:MINSIZEREL>>:${stlab_Clang_release_flags};>"
+  "$<CONFIG:RELWITHDEBINFO>,"
+  "$<CONFIG:MINSIZEREL>>:${stlab_Clang_release_flags};>"
   "$<$<AND:$<CONFIG:DEBUG>,"
-          "$<BOOL:${stlab.coverage}>>:${stlab_Clang_debug_flags};>")
+  "$<BOOL:${stlab.coverage}>>:${stlab_Clang_debug_flags};>")
 
 target_compile_options(development INTERFACE
   $<$<CXX_COMPILER_ID:Clang>:${generator}>)
diff --git a/test/future_then_tests.cpp b/test/future_then_tests.cpp
index c3ec2d8d..b2d9045f 100644
--- a/test/future_then_tests.cpp
+++ b/test/future_then_tests.cpp
@@ -795,7 +795,7 @@ BOOST_AUTO_TEST_CASE(future_continuation_async_move_only_container) {
         check_valid_future(sut);
         auto result = stlab::await(std::move(sut));
 
-        BOOST_REQUIRE_EQUAL(3, result.size());
+        BOOST_REQUIRE_EQUAL(std::size_t{3}, result.size());
         BOOST_REQUIRE_EQUAL(10, result[0].member());
         BOOST_REQUIRE_EQUAL(42, result[1].member());
         BOOST_REQUIRE_EQUAL(50, result[2].member());