diff --git a/CMakeLists.txt b/CMakeLists.txt
index b541a9c20..c67f73aee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,8 @@ if( CMAKE_COMPILER_IS_GNUCXX )
 	set( PROFILE 0 CACHE BOOL "Enable profiling with gprof for Debug and RelWithDebInfo build types." )
 endif( CMAKE_COMPILER_IS_GNUCXX )
 
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
+
 find_package( BZip2 )
 find_package( JPEG )
 find_package( ZLIB )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6f8eba214..da0653527 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -257,7 +257,7 @@ endif( FMOD_LIBRARY )
 
 # Search for FluidSynth
 
-include( ../FindFluidSynth.cmake )
+find_package( FluidSynth )
 
 # Search for NASM
 
diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index cc2a5630d..467bc4e32 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -2399,7 +2399,7 @@ int DLevelScript::DoSpawnSpotFacing (int type, int spot, int tid, bool force)
 
 void DLevelScript::DoFadeTo (int r, int g, int b, int a, fixed_t time)
 {
-	DoFadeRange (0, 0, 0, -1, r, g, b, a, time);
+	DoFadeRange (0, 0, 0, -1, clamp(r, 0, 255), clamp(g, 0, 255), clamp(b, 0, 255), clamp(a, 0, FRACUNIT), time);
 }
 
 void DLevelScript::DoFadeRange (int r1, int g1, int b1, int a1,
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index 73928b8bd..c7e9c6cd9 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -791,6 +791,13 @@ OptionMenu "AltHUDOptions"
 //
 //-------------------------------------------------------------------------------------------
 
+OptionValue Autosave
+{
+	0,	"Always"
+	1,	"Scripts Only"
+	2,	"Never"
+}
+
 OptionMenu "MiscOptions"
 {
 	Title "Miscellaneous Options"
@@ -803,7 +810,7 @@ OptionMenu "MiscOptions"
 	Option "Show IWAD selection dialog",			"queryiwad", "OnOff"
 	StaticText " "
 	Option "Enable cheats from all games",			"allcheats", "OnOff"
-	Option "Enable autosaves",						"disableautosave", "OffOn"
+	Option "Enable autosaves",						"disableautosave", "Autosave"
 	Slider "Number of autosaves",					"autosavecount", 1, 32, 1, 0
 	StaticText " "
 	Option "Cache nodes",							"gl_cachenodes", "OnOff"