diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index d70cc2c0b..fa9e6d9c9 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -6807,7 +6807,18 @@ scriptwait:
 			break;
 
 		case PCD_PRINTBINARY:
+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ >= 6)))
+#define HAS_DIAGNOSTIC_PRAGMA
+#endif
+#ifdef HAS_DIAGNOSTIC_PRAGMA
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat="
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
+#endif
 			work.AppendFormat ("%B", STACK(1));
+#ifdef HAS_DIAGNOSTIC_PRAGMA
+#pragma GCC diagnostic pop
+#endif
 			--sp;
 			break;
 
diff --git a/src/sdl/i_main.cpp b/src/sdl/i_main.cpp
index 65b992f6a..1736305d8 100644
--- a/src/sdl/i_main.cpp
+++ b/src/sdl/i_main.cpp
@@ -257,7 +257,12 @@ int main (int argc, char **argv)
 #if defined(__MACH__) && !defined(NOASM)
 	unprotect_rtext();
 #endif
-	
+
+	// Set LC_NUMERIC environment variable in case some library decides to
+	// clear the setlocale call at least this will be correct.
+	// Note that the LANG environment variable is overridden by LC_*
+	setenv ("LC_NUMERIC", "C", 1);
+
 #ifndef NO_GTK
 	GtkAvailable = gtk_init_check (&argc, &argv);
 #endif