diff --git a/src/d_main.cpp b/src/d_main.cpp
index 8965812e3..242ae5759 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -809,7 +809,7 @@ void D_Display ()
 			{
 				StatusBar->DrawBottomStuff (HUD_AltHud);
 				if (DrawFSHUD || automapactive) DrawHUD();
-				if (players[consoleplayer].camera && players[consoleplayer].camera->player)
+				if (players[consoleplayer].camera && players[consoleplayer].camera->player && !automapactive)
 				{
 					StatusBar->DrawCrosshair();
 				}
diff --git a/src/g_level.cpp b/src/g_level.cpp
index 734f03bb6..9c526f184 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -1080,7 +1080,7 @@ void G_DoLoadLevel (int position, bool autosave)
 			}
 			E_PlayerEntered(ii, finishstate == FINISH_SameHub);
 			// ENTER scripts are being handled when the player gets spawned, this cannot be changed due to its effect on voodoo dolls.
-			if (level.FromSnapshot) FBehavior::StaticStartTypedScripts(SCRIPT_Return, players[ii].mo, true);
+			if (level.FromSnapshot && !savegamerestore) FBehavior::StaticStartTypedScripts(SCRIPT_Return, players[ii].mo, true);
 		}
 	}
 
diff --git a/src/gl/renderer/gl_renderer.h b/src/gl/renderer/gl_renderer.h
index 1688cfc1a..0ffefb6c5 100644
--- a/src/gl/renderer/gl_renderer.h
+++ b/src/gl/renderer/gl_renderer.h
@@ -79,7 +79,8 @@ enum
 {
 	DM_MAINVIEW,
 	DM_OFFSCREEN,
-	DM_PORTAL
+	DM_PORTAL,
+	DM_SKYPORTAL
 };
 
 class FGLRenderer
diff --git a/src/gl/scene/gl_portal.cpp b/src/gl/scene/gl_portal.cpp
index 4cf8b9e7b..967f6b3fc 100644
--- a/src/gl/scene/gl_portal.cpp
+++ b/src/gl/scene/gl_portal.cpp
@@ -655,7 +655,7 @@ void GLSkyboxPortal::DrawContents()
 	SaveMapSection();
 	currentmapsection[mapsection >> 3] |= 1 << (mapsection & 7);
 
-	GLRenderer->DrawScene(DM_PORTAL);
+	GLRenderer->DrawScene(DM_SKYPORTAL);
 	portal->mFlags &= ~PORTSF_INSKYBOX;
 	inskybox = false;
 	gl_RenderState.SetDepthClamp(oldclamp);
diff --git a/src/gl/scene/gl_scene.cpp b/src/gl/scene/gl_scene.cpp
index 9d063d6ad..6c2556e87 100644
--- a/src/gl/scene/gl_scene.cpp
+++ b/src/gl/scene/gl_scene.cpp
@@ -491,7 +491,7 @@ void FGLRenderer::DrawScene(int drawmode)
 	{
 		ssao_portals_available = 0;
 	}
-	else if (ssao_portals_available > 0)
+	else if (drawmode == DM_PORTAL && ssao_portals_available > 0)
 	{
 		applySSAO = true;
 		ssao_portals_available--;
diff --git a/src/r_data/r_translate.cpp b/src/r_data/r_translate.cpp
index 64f00b5bc..adcbc93fd 100644
--- a/src/r_data/r_translate.cpp
+++ b/src/r_data/r_translate.cpp
@@ -561,7 +561,6 @@ void FRemapTable::AddToTranslation(const char *range)
 		}
 
 		sc.MustGetAnyToken();
-		Printf(0, "token type: %d", sc.TokenType);
 
 		if (sc.TokenType == '[')
 		{