diff --git a/sc2/src/sc2code/clock.c b/sc2/src/sc2code/clock.c
index 62f666c91..7fdbbc5ce 100644
--- a/sc2/src/sc2code/clock.c
+++ b/sc2/src/sc2code/clock.c
@@ -65,7 +65,7 @@ int clock_task_func(void* data)
 				 * can be halted. (e.g. during battle
 				 * or communications)
 				 */
-		SetSemaphore (GLOBAL (GameClock).clock_sem);
+		SetSemaphore (GLOBAL (GameClock.clock_sem));
 		TimeIn = GetTimeCounter ();
 
 		if (GLOBAL (GameClock).tick_count <= 0
@@ -165,7 +165,7 @@ int clock_task_func(void* data)
 			LastTime += num_ticks;
 		}
 		
-		ClearSemaphore (GLOBAL (GameClock).clock_sem);
+		ClearSemaphore (GLOBAL (GameClock.clock_sem));
 		SleepThreadUntil (TimeIn + ONE_SECOND / 120);
 	}
 	FinishTask (task);
diff --git a/sc2/src/sc2code/init.c b/sc2/src/sc2code/init.c
index 763742dac..e8e387dc2 100644
--- a/sc2/src/sc2code/init.c
+++ b/sc2/src/sc2code/init.c
@@ -271,7 +271,7 @@ InitGlobData (void)
 	// The clock semaphore was initially initialized as '1'
 	// but it is always cleared before set, so it toggled between
 	// 2 and 1, which doesn't actually do anything
-	(GLOBAL (GameClock)).clock_sem = CreateSemaphore(0,  "Clock");
+	GLOBAL (GameClock.clock_sem) = CreateSemaphore(0,  "Clock");
 }
 
 int
diff --git a/sc2/src/sc2code/outfit.c b/sc2/src/sc2code/outfit.c
index 4b96240ae..e58bc0c07 100644
--- a/sc2/src/sc2code/outfit.c
+++ b/sc2/src/sc2code/outfit.c
@@ -600,7 +600,7 @@ DoOutfit (PMENU_STATE pMS)
 			SetTransitionSource (NULL);
 			BatchGraphics ();
 			DrawSISFrame ();
-			SetSemaphore(GraphicsSem);
+			SetSemaphore (GraphicsSem);
 			DrawSISMessage (GAME_STRING (STARBASE_STRING_BASE + 2));
 			DrawSISTitle (GAME_STRING (STARBASE_STRING_BASE));
 
@@ -656,13 +656,13 @@ DoOutfit (PMENU_STATE pMS)
 					DrawStamp ((PSTAMP)&s);
 			}
 
-			ClearSemaphore(GraphicsSem);
+			ClearSemaphore (GraphicsSem);
 			DrawMenuStateStrings (PM_FUEL, pMS->CurState);
-			SetSemaphore(GraphicsSem);
+			SetSemaphore (GraphicsSem);
 			DrawFlagshipName (FALSE);
 			if (optWhichFonts == OPT_PC)
 				DrawFlagshipStats ();
-			ClearSemaphore(GraphicsSem);
+			ClearSemaphore (GraphicsSem);
 
 			{
 				RECT r;
diff --git a/sc2/src/sc2code/shipyard.c b/sc2/src/sc2code/shipyard.c
index 937a6fee7..44a4daa44 100644
--- a/sc2/src/sc2code/shipyard.c
+++ b/sc2/src/sc2code/shipyard.c
@@ -1220,10 +1220,10 @@ DoShipyard (PMENU_STATE pMS)
 			BatchGraphics ();
 
 			DrawSISFrame ();
-			SetSemaphore(GraphicsSem);
+			SetSemaphore (GraphicsSem);
 			DrawSISMessage (GAME_STRING (STARBASE_STRING_BASE + 3));
 			DrawSISTitle (GAME_STRING (STARBASE_STRING_BASE));
-			ClearSemaphore(GraphicsSem);
+			ClearSemaphore (GraphicsSem);
 			DrawBluePrint (pMS);
 			pMS->ModuleFrame = s.frame;