diff --git a/cmake/project-defaults.cmake b/cmake/project-defaults.cmake
index 08f50a4ece..c262bac8af 100644
--- a/cmake/project-defaults.cmake
+++ b/cmake/project-defaults.cmake
@@ -17,7 +17,7 @@ add_compile_options(
     # "Standard C++ exception handling" (C++ stack unwinding including extern c)
     /EHsc
     # Enable warnings and warnings as errors
-    /W3
+    /W4
     /WX
     # Disable RTTI
     $<$<COMPILE_LANGUAGE:CXX>:/GR->
diff --git a/yoga/bits/NumericBitfield.h b/yoga/bits/NumericBitfield.h
index 63f7eb657b..d6102409b2 100644
--- a/yoga/bits/NumericBitfield.h
+++ b/yoga/bits/NumericBitfield.h
@@ -34,7 +34,7 @@ template <
     typename Enum,
     std::enable_if_t<(ordinalCount<Enum>() > 0), bool> = true>
 constexpr uint8_t minimumBitCount() {
-  return details::log2ceilFn(ordinalCount<Enum>() - 1);
+  return details::log2ceilFn(static_cast<uint8_t>(ordinalCount<Enum>() - 1));
 }
 
 template <typename Enum>