diff --git a/docs/CONTRIBUTORS b/docs/CONTRIBUTORS
index 8c6c42276..ec5d964cc 100644
--- a/docs/CONTRIBUTORS
+++ b/docs/CONTRIBUTORS
@@ -31,6 +31,7 @@ Philipp Wagner
 Pieter Kapsenberg
 Richard Myers
 Sebastien Van Cauwenberghe
+Sean Cross
 Stefan Wallentowitz
 Tobias Rosenkranz
 Tobias Wölfel
diff --git a/include/verilated_cov.h b/include/verilated_cov.h
index c0786ab13..3b8c22634 100644
--- a/include/verilated_cov.h
+++ b/include/verilated_cov.h
@@ -62,10 +62,10 @@
 ///             VL_COVER_INSERT(&m_cases[i], "comment", "Coverage Case", "i", cvtToNumStr(i));
 ///     }
 
-#define VL_COVER_INSERT(countp,args...) \
+#define VL_COVER_INSERT(countp,...) \
     VL_IF_COVER(VerilatedCov::_inserti(countp); \
                 VerilatedCov::_insertf(__FILE__, __LINE__); \
-                VerilatedCov::_insertp("hier", name(), args))
+                VerilatedCov::_insertp("hier", name(), __VA_ARGS__))
 
 //=============================================================================
 /// Convert VL_COVER_INSERT value arguments to strings
diff --git a/include/verilated_dpi.cpp b/include/verilated_dpi.cpp
index d25339def..7b4678ea1 100644
--- a/include/verilated_dpi.cpp
+++ b/include/verilated_dpi.cpp
@@ -42,8 +42,8 @@
     VL_FATAL_MT(__FILE__, __LINE__, "", \
                 (std::string("%%Error: Unsupported DPI function: ")+VL_FUNC).c_str())
 
-#define _VL_SVDPI_WARN(message...) \
-    VL_PRINTF_MT(message)
+#define _VL_SVDPI_WARN(...) \
+    VL_PRINTF_MT(__VA_ARGS__)
 
 // Function requires a "context" in the import declaration
 #define _VL_SVDPI_CONTEXT_WARN() \