diff --git a/examples/tracing_c/Makefile_obj b/examples/tracing_c/Makefile_obj
index 610a9394c..8da2f6d0a 100644
--- a/examples/tracing_c/Makefile_obj
+++ b/examples/tracing_c/Makefile_obj
@@ -24,8 +24,10 @@ include Vtop.mk
 CPPFLAGS += -MMD -MP
 CPPFLAGS += -DVL_DEBUG=1
 # Turn on some more flags (when configured appropriately)
+# For testing inside Verilator, "configure --enable-ccwarn" will do this
+# automatically; otherwise you may want this unconditionally enabled
 ifeq ($(CFG_WITH_CCWARN),yes)	# Local... Else don't burden users
-CPPFLAGS += -W -Werror -Wall
+USER_CPPFLAGS_WALL += -W -Werror -Wall
 endif
 
 # See the benchmarking section of bin/verilator.
diff --git a/examples/tracing_sc/Makefile_obj b/examples/tracing_sc/Makefile_obj
index 4a19800d7..5cee37b4a 100644
--- a/examples/tracing_sc/Makefile_obj
+++ b/examples/tracing_sc/Makefile_obj
@@ -26,8 +26,10 @@ CPPFLAGS += -DVL_DEBUG=1
 # SystemC isn't too clean
 CPPFLAGS += -Wno-deprecated
 # Turn on some more flags (when configured appropriately)
+# For testing inside Verilator, "configure --enable-ccwarn" will do this
+# automatically; otherwise you may want this unconditionally enabled
 ifeq ($(CFG_WITH_CCWARN),yes)	# Local... Else don't burden users
-CPPFLAGS += -W -Werror -Wall
+USER_CPPFLAGS_WALL += -W -Werror -Wall
 endif
 
 # If you build your own rules from scratch, note you need to include
diff --git a/test_regress/t/t_param_public.cpp b/test_regress/t/t_param_public.cpp
index bdceb7470..9bf79f879 100644
--- a/test_regress/t/t_param_public.cpp
+++ b/test_regress/t/t_param_public.cpp
@@ -16,7 +16,7 @@ int main (int argc, char *argv[]) {
     Verilated::debug(0);
 
     // Make sure public tag worked
-    if (Vt_param_public_p::INPACK == Vt_param_public_p::INPACK) {}
+    if (static_cast<bool>(Vt_param_public_p::INPACK)) {}
 
     for (int i = 0; i < 10; i++) {
 	topp->eval();