diff --git a/projects/rocprofiler-systems/cmake/BuildSettings.cmake b/projects/rocprofiler-systems/cmake/BuildSettings.cmake
index e34de29411..74f655d1fc 100644
--- a/projects/rocprofiler-systems/cmake/BuildSettings.cmake
+++ b/projects/rocprofiler-systems/cmake/BuildSettings.cmake
@@ -199,10 +199,8 @@ endif()
 #
 omnitrace_add_interface_library(omnitrace-develop-options "Adds developer compiler flags")
 if(OMNITRACE_BUILD_DEVELOPER)
-    add_target_flag_if_avail(
-        omnitrace-develop-options
-        # "-Wabi"
-        "-Wdouble-promotion" "-Wshadow" "-Wextra" "-Wpedantic" "-Werror" "/showIncludes")
+    add_target_flag_if_avail(omnitrace-develop-options "-Werror" "-Wdouble-promotion"
+                             "-Wshadow" "-Wextra" "-Wpedantic" "-Werror" "/showIncludes")
 endif()
 
 # ----------------------------------------------------------------------------------------#
diff --git a/projects/rocprofiler-systems/source/lib/omnitrace/library/debug.hpp b/projects/rocprofiler-systems/source/lib/omnitrace/library/debug.hpp
index 7912efafb5..f7ee27c4c1 100644
--- a/projects/rocprofiler-systems/source/lib/omnitrace/library/debug.hpp
+++ b/projects/rocprofiler-systems/source/lib/omnitrace/library/debug.hpp
@@ -340,20 +340,20 @@ get_chars(T&& _c, std::index_sequence<Idx...>)
 //--------------------------------------------------------------------------------------//
 #define OMNITRACE_VERBOSE(LEVEL, ...)                                                    \
     OMNITRACE_CONDITIONAL_PRINT(                                                         \
-        ::omnitrace::get_debug() || ::omnitrace::get_verbose() >= LEVEL, __VA_ARGS__)
+        ::omnitrace::get_debug() || (::omnitrace::get_verbose() >= LEVEL), __VA_ARGS__)
 
 #define OMNITRACE_BASIC_VERBOSE(LEVEL, ...)                                              \
     OMNITRACE_CONDITIONAL_BASIC_PRINT(::omnitrace::get_debug_env() ||                    \
-                                          ::omnitrace::get_verbose_env() >= LEVEL,       \
+                                          (::omnitrace::get_verbose_env() >= LEVEL),     \
                                       __VA_ARGS__)
 
 #define OMNITRACE_VERBOSE_F(LEVEL, ...)                                                  \
     OMNITRACE_CONDITIONAL_PRINT_F(                                                       \
-        ::omnitrace::get_debug() || ::omnitrace::get_verbose() >= LEVEL, __VA_ARGS__)
+        ::omnitrace::get_debug() || (::omnitrace::get_verbose() >= LEVEL), __VA_ARGS__)
 
 #define OMNITRACE_BASIC_VERBOSE_F(LEVEL, ...)                                            \
     OMNITRACE_CONDITIONAL_BASIC_PRINT_F(::omnitrace::get_debug_env() ||                  \
-                                            ::omnitrace::get_verbose_env() >= LEVEL,     \
+                                            (::omnitrace::get_verbose_env() >= LEVEL),   \
                                         __VA_ARGS__)
 
 //--------------------------------------------------------------------------------------//