diff --git a/src/sdl2/i_system.c b/src/sdl2/i_system.c
index f198e874..8c08cafa 100644
--- a/src/sdl2/i_system.c
+++ b/src/sdl2/i_system.c
@@ -2284,8 +2284,12 @@ void I_Quit(void)
 	G_SaveGameData(); // Tails 12-08-2002
 	//added:16-02-98: when recording a demo, should exit using 'q' key,
 	//        but sometimes we forget and use 'F10'.. so save here too.
-	if (demorecording || metalrecording)
+
+	if (demorecording)
 		G_CheckDemoStatus();
+	if (metalrecording)
+		G_StopMetalRecording();
+
 	D_QuitNetGame();
 	I_ShutdownMusic();
 	I_ShutdownSound();
@@ -2437,8 +2441,10 @@ void I_Error(const char *error, ...)
 	G_SaveGameData(); // Tails 12-08-2002
 
 	// Shutdown. Here might be other errors.
-	if (demorecording || metalrecording)
+	if (demorecording)
 		G_CheckDemoStatus();
+	if (metalrecording)
+		G_StopMetalRecording();
 
 	D_QuitNetGame();
 	I_ShutdownMusic();
diff --git a/src/sdl2/i_video.c b/src/sdl2/i_video.c
index 77a5d149..40cee97c 100644
--- a/src/sdl2/i_video.c
+++ b/src/sdl2/i_video.c
@@ -1518,6 +1518,7 @@ INT32 VID_GetModeForSize(INT32 w, INT32 h)
 	return -1;
 #if 0
 	INT32 matchMode = -1, i;
+	VID_PrepareModeList();
 	if (USE_FULLSCREEN && numVidModes != -1)
 	{
 		for (i=firstEntry; i<numVidModes; i++)
@@ -1587,6 +1588,14 @@ void VID_PrepareModeList(void)
 	INT32 i;
 
 	firstEntry = 0;
+
+#ifdef HWRENDER
+	if (rendermode == render_opengl)
+		modeList = SDL_ListModes(NULL, SDL_OPENGL|SDL_FULLSCREEN);
+	else
+#endif
+	modeList = SDL_ListModes(NULL, surfaceFlagsF|SDL_HWSURFACE); //Alam: At least hardware surface
+
 	if (disable_fullscreen?0:cv_fullscreen.value) // only fullscreen needs preparation
 	{
 		if (-1 != numVidModes)
diff --git a/src/sdl2/macosx/Srb2mac.xcodeproj/project.pbxproj b/src/sdl2/macosx/Srb2mac.xcodeproj/project.pbxproj
index f898a993..16a01ee6 100644
--- a/src/sdl2/macosx/Srb2mac.xcodeproj/project.pbxproj
+++ b/src/sdl2/macosx/Srb2mac.xcodeproj/project.pbxproj
@@ -976,11 +976,11 @@
 			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "Srb2mac" */;
 			buildPhases = (
 				8D1107290486CEB800E47090 /* Resources */,
-				677E4CB30E1765500034519D /* ShellScript */,
+				677E4CB30E1765500034519D /* Get SCM Info */,
 				8D11072C0486CEB800E47090 /* Sources */,
 				8D11072E0486CEB800E47090 /* Frameworks */,
 				002F39FD09D0883400EBEB88 /* Copy Frameworks into .app bundle */,
-				679B708A102B872300AA9E4C /* ShellScript */,
+				679B708A102B872300AA9E4C /* Make DMG */,
 			);
 			buildRules = (
 			);
@@ -1028,7 +1028,7 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		677E4CB30E1765500034519D /* ShellScript */ = {
+		677E4CB30E1765500034519D /* Get SCM Info */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			comments = "update the time and date stamps in src/comptime.c";
@@ -1036,13 +1036,14 @@
 			);
 			inputPaths = (
 			);
+			name = "Get SCM Info";
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "PATH=\"/usr/local/bin:$PATH\" $SRCROOT/../../../comptime.sh $SRCROOT/../../";
 		};
-		679B708A102B872300AA9E4C /* ShellScript */ = {
+		679B708A102B872300AA9E4C /* Make DMG */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			comments = "make DMG file for Release builds";
@@ -1051,13 +1052,14 @@
 			inputPaths = (
 				$BUILT_PRODUCTS_DIR/$WRAPPER_NAME,
 			);
+			name = "Make DMG";
 			outputPaths = (
 				$BUILT_PRODUCTS_DIR/$TARGET_NAME.nodata.dmg,
 				$BUILT_PRODUCTS_DIR/$TARGET_NAME.dmg,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "set -ex\n\n[ \"$ACTION\" = build ] || exit 0\n[ \"$CURRENT_VARIANT\" = \"normal\" ] || exit 0\n[ \"$BUILD_STYLE\" = \"Release\" ] || exit 0\n\ndir=\"$TEMP_FILES_DIR/$TARGET_NAME.disk\"\ndmg=\"$BUILT_PRODUCTS_DIR/$TARGET_NAME.dmg\"\ndmg_nodata=\"$BUILT_PRODUCTS_DIR/$TARGET_NAME.nodata.dmg\"\n\nrm -rf -- \"$dir\"\nmkdir \"$dir\"\ncp -R \"$BUILT_PRODUCTS_DIR/$WRAPPER_NAME\" \"$dir\"\nrm -f -- \"$dmg\"\nhdiutil create -ov -fs HFS+ -srcfolder \"$dir\" -volname \"$TARGET_NAME\" \"$dmg\"\nhdiutil internet-enable -yes \"$dmg\"\ncd \"$dir/$WRAPPER_NAME/Contents/Resources\"\nrm -f -- *.wad\nrm -f -- *.dta\nrm -f -- *.plr\nrm -f -- *.wpn\ncd \"$OLDPWD\"\nrm -f -- \"$dmg_nodata\"\nhdiutil create -ov -fs HFS+ -srcfolder \"$dir\" -volname \"$TARGET_NAME Lite\" \"$dmg_nodata\"\nhdiutil internet-enable -yes \"$dmg_nodata\"\nrm -rf -- \"$dir\"";
+			shellScript = "set -ex\n\n[ \"$ACTION\" = build ] || exit 0\n[ \"$CURRENT_VARIANT\" = \"normal\" ] || exit 0\n[ \"$BUILD_STYLE\" = \"Release\" ] || exit 0\n\ndir=\"$TEMP_FILES_DIR/$TARGET_NAME.disk\"\ndmg=\"$BUILT_PRODUCTS_DIR/$TARGET_NAME.dmg\"\ndmg_nodata=\"$BUILT_PRODUCTS_DIR/$TARGET_NAME.nodata.dmg\"\n\nrm -rf -- \"$dir\"\nmkdir \"$dir\"\ncp -R \"$BUILT_PRODUCTS_DIR/$WRAPPER_NAME\" \"$dir\"\nrm -f -- \"$dmg\"\nhdiutil create -ov -fs HFS+ -srcfolder \"$dir\" -volname \"$TARGET_NAME\" \"$dmg\"\nhdiutil internet-enable -yes \"$dmg\"\ncd \"$dir/$WRAPPER_NAME/Contents/Resources\"\nrm -f -- *.wad\nrm -f -- *.dta\nrm -f -- *.plr\nrm -f -- *.wpn\nrm -f -- *.srb2\ncd \"$OLDPWD\"\nrm -f -- \"$dmg_nodata\"\nhdiutil create -ov -fs HFS+ -srcfolder \"$dir\" -volname \"$TARGET_NAME Lite\" \"$dmg_nodata\"\nhdiutil internet-enable -yes \"$dmg_nodata\"\nrm -rf -- \"$dir\"";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -1212,7 +1214,7 @@
 		C01FCF4B08A954540054247B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CURRENT_PROJECT_VERSION = 2.1.2;
+				CURRENT_PROJECT_VERSION = 2.1.6;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"$(inherited)",
 					NORMALSRB2,
@@ -1224,7 +1226,7 @@
 		C01FCF4C08A954540054247B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				CURRENT_PROJECT_VERSION = 2.1.2;
+				CURRENT_PROJECT_VERSION = 2.1.6;
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = (