diff --git a/src/emu/devfind.h b/src/emu/devfind.h
index 663bede2c87..ee137f9126b 100644
--- a/src/emu/devfind.h
+++ b/src/emu/devfind.h
@@ -154,7 +154,7 @@ public:
 	void set_tag(const char *tag) { m_tag = tag; }
 
 	/// \brief Dummy tag always treated as not found
-	constexpr static char DUMMY_TAG[] = "finder_dummy_tag";
+	constexpr static char DUMMY_TAG[17] = "finder_dummy_tag";
 
 protected:
 	/// \brief Designated constructor
diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp
index 1afb814012e..52d605f9729 100644
--- a/src/mame/drivers/vgmplay.cpp
+++ b/src/mame/drivers/vgmplay.cpp
@@ -4,7 +4,11 @@
 // A "virtual" driver to play vgm files
 // Use with mame vgmplay -bitb file.vgm
 
+#if defined(_MSC_VER)
 #include "zlib/zlib.h"
+#else
+#include <zlib.h>
+#endif
 
 #include "emu.h"
 #include "debugger.h"