diff --git a/include/boost/process/v1/environment.hpp b/include/boost/process/v1/environment.hpp
index 8e729ff4..6ba67c4f 100644
--- a/include/boost/process/v1/environment.hpp
+++ b/include/boost/process/v1/environment.hpp
@@ -263,7 +263,7 @@ public:
         auto st1 = key + ::boost::process::v1::detail::equal_sign<Char>();
         while (*p != nullptr)
         {
-            const std::size_t len = std::char_traits<Char>::length(*p);
+            const std::ptrdiff_t len = std::char_traits<Char>::length(*p);
             if ((std::distance(st1.begin(), st1.end()) < len)
                  && std::equal(st1.begin(), st1.end(), *p))
                 break;
diff --git a/include/boost/process/v2/detail/process_handle_fd.hpp b/include/boost/process/v2/detail/process_handle_fd.hpp
index d004f10a..ba12c7f7 100644
--- a/include/boost/process/v2/detail/process_handle_fd.hpp
+++ b/include/boost/process/v2/detail/process_handle_fd.hpp
@@ -254,8 +254,8 @@ struct basic_process_handle_fd
         {
             ec.clear();
             exit_code = code;
-            return false;
         }
+      return false;
     }
 
     bool running(native_exit_code_type &exit_code)
diff --git a/include/boost/process/v2/detail/process_handle_fd_or_signal.hpp b/include/boost/process/v2/detail/process_handle_fd_or_signal.hpp
index d5215596..9dc6d93c 100644
--- a/include/boost/process/v2/detail/process_handle_fd_or_signal.hpp
+++ b/include/boost/process/v2/detail/process_handle_fd_or_signal.hpp
@@ -283,10 +283,9 @@ struct basic_process_handle_fd_or_signal
         if (process_is_running(res))
             return true;
         else
-        {
             exit_code = code;
-            return false;
-        }
+
+        return false;
     }
 
     bool running(native_exit_code_type &exit_code)
diff --git a/include/boost/process/v2/detail/process_handle_signal.hpp b/include/boost/process/v2/detail/process_handle_signal.hpp
index 811f67db..0c27a547 100644
--- a/include/boost/process/v2/detail/process_handle_signal.hpp
+++ b/include/boost/process/v2/detail/process_handle_signal.hpp
@@ -248,10 +248,8 @@ struct basic_process_handle_signal
         if (res == 0)
             return true;
         else
-        {
             exit_code = code;
-            return false;
-        }
+        return false;
     }
 
     bool running(native_exit_code_type &exit_code)
diff --git a/include/boost/process/v2/detail/process_handle_windows.hpp b/include/boost/process/v2/detail/process_handle_windows.hpp
index a18443d1..274caf7b 100644
--- a/include/boost/process/v2/detail/process_handle_windows.hpp
+++ b/include/boost/process/v2/detail/process_handle_windows.hpp
@@ -247,10 +247,9 @@ struct basic_process_handle_win
         if (process_is_running(code))
             return true;
         else
-        {
             exit_code = code;
-            return false;
-        }
+
+        return false;
     }
 
     bool running(native_exit_code_type &exit_code)
diff --git a/test/v1/async_system_stackless.cpp b/test/v1/async_system_stackless.cpp
index 918577be..f5ba6c07 100644
--- a/test/v1/async_system_stackless.cpp
+++ b/test/v1/async_system_stackless.cpp
@@ -46,7 +46,10 @@ BOOST_AUTO_TEST_CASE(stackless, *boost::unit_test::timeout(15))
                 boost::system::error_code ec = boost::system::error_code(),
                 std::size_t exit_code = 0)
         {
-            if (!ec) reenter (this)
+            if (ec)
+              return;
+
+            reenter (this)
             {
                 yield bp::async_system(
                         ios, *this,
diff --git a/test/v2/ext.cpp b/test/v2/ext.cpp
index 7af93d45..46cbdc07 100644
--- a/test/v2/ext.cpp
+++ b/test/v2/ext.cpp
@@ -79,7 +79,7 @@ BOOST_AUTO_TEST_CASE(cmd_exe)
     bp2::basic_cstring_ref<typename bp2::shell::char_type> ref(cm.argv()[0]);
     BOOST_CHECK_EQUAL(bp2::detail::conv_string<char>(ref.data(), ref.size()), pth);
 
-    BOOST_REQUIRE_EQUAL(cm.argc(), args.size() + 1);
+    BOOST_REQUIRE_EQUAL(cm.argc(), args.size() + 1u);
     for (auto i = 0u; i < args.size(); i++)
     {
       ref = cm.argv()[i + 1];
diff --git a/test/v2/process.cpp b/test/v2/process.cpp
index e165c249..0a4009a1 100644
--- a/test/v2/process.cpp
+++ b/test/v2/process.cpp
@@ -370,7 +370,7 @@ BOOST_AUTO_TEST_CASE(popen)
     // default CWD
     bpv::popen proc(/*bpv::default_process_launcher(), */ctx, pth, {"echo"});
 
-    BOOST_CHECK_EQUAL(asio::write(proc, asio::buffer("FOOBAR", 6)), 6);
+    BOOST_CHECK_EQUAL(asio::write(proc, asio::buffer("FOOBAR", 6)), 6u);
 
     proc.get_stdin().close();