diff --git a/sc2/src/sc2code/planets/plangen.c b/sc2/src/sc2code/planets/plangen.c
index 638c90464..1d0528144 100644
--- a/sc2/src/sc2code/planets/plangen.c
+++ b/sc2/src/sc2code/planets/plangen.c
@@ -93,6 +93,7 @@ RenderTopography (BOOLEAN Reconstruct)
 				pSolarSysState->PlanetFrameArray[2], 1
 				);
 #endif
+		s.frame = pSolarSysState->TopoFrame;
 		DrawStamp (&s);
 	}
 	else
diff --git a/sc2/src/sc2code/planets/pstarmap.c b/sc2/src/sc2code/planets/pstarmap.c
index 785ef3a18..ae4908ab8 100644
--- a/sc2/src/sc2code/planets/pstarmap.c
+++ b/sc2/src/sc2code/planets/pstarmap.c
@@ -1223,15 +1223,17 @@ DoFlagshipCommands (INPUT_STATE InputState, PMENU_STATE pMS)
 						
 						if (LOBYTE (GLOBAL(CurrentActivity)) == IN_INTERPLANETARY)
 						{
+							SetSemaphore(GraphicsSem);
 							ClearSISRect(DRAW_SIS_DISPLAY);
+							ClearSemaphore(GraphicsSem);
 							DrawSISFrame();
+							SetSemaphore(GraphicsSem);
 							RepairSISBorder();
 							DrawSISMessage(NULL_PTR);
 							DrawSISTitle(GLOBAL_SIS(PlanetName));
 							DrawStarBackGround(TRUE);
 							OldContext = SetContext(SpaceContext);
 							SetContextDrawState(DEST_PIXMAP | DRAW_REPLACE);
-							SetSemaphore(GraphicsSem);
 							BatchGraphics();
 							DrawPlanet(SIS_SCREEN_WIDTH - MAP_WIDTH, SIS_SCREEN_HEIGHT - MAP_HEIGHT, 0, 0);
 							UnbatchGraphics();