diff --git a/scripts/genie.lua b/scripts/genie.lua
index 7fd13787389..f43f06b94b3 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -998,13 +998,9 @@ end
 				"-Wno-tautological-compare",
 				"-Wno-dynamic-class-memaccess",
 			}
-			if (version >= 30200) then
+			if (version >= 30000) then
 				buildoptions {
 					"-Wno-unused-value",
-				}
-			end
-			if (version >= 30400) then
-				buildoptions {
 					"-Wno-inline-new-delete",
 					"-Wno-constant-logical-operand",
 				}
diff --git a/src/devices/sound/samples.cpp b/src/devices/sound/samples.cpp
index 6da7dd48f16..4c209ec72ae 100644
--- a/src/devices/sound/samples.cpp
+++ b/src/devices/sound/samples.cpp
@@ -571,7 +571,7 @@ bool samples_device::read_flac_sample(emu_file &file, sample_t &sample)
 	file.seek(0, SEEK_SET);
 
 	// create the FLAC decoder and fill in the sample data
-	flac_decoder decoder(file);
+	flac_decoder decoder((core_file&) file);
 	sample.frequency = decoder.sample_rate();
 
 	// error if more than 1 channel or not 16bpp
diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp
index d891aae1d73..7fb6d51ef9e 100644
--- a/src/emu/emuopts.cpp
+++ b/src/emu/emuopts.cpp
@@ -557,7 +557,7 @@ bool emu_options::parse_one_ini(const char *basename, int priority, std::string
 	// parse the file
 	osd_printf_verbose("Parsing %s.ini\n", basename);
 	std::string error;
-	bool result = parse_ini_file(file, priority, OPTION_PRIORITY_DRIVER_INI, error);
+	bool result = parse_ini_file((core_file&)file, priority, OPTION_PRIORITY_DRIVER_INI, error);
 
 	// append errors if requested
 	if (!error.empty() && error_string != NULL)