diff --git a/src/management/finance.c b/src/management/finance.c
index ba63fe9d99..a6b2aacbe2 100644
--- a/src/management/finance.c
+++ b/src/management/finance.c
@@ -190,7 +190,7 @@ void finance_init() {
 	gTotalAdmissions = 0;
 	gTotalIncomeFromAdmissions = 0;
 
-	RCT2_GLOBAL(0x013587D8, uint16) = 0x3F;
+	RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_COMPLETED_BY, uint16) = 0x3F;
 
 	finance_update_loan_hash();
 }
diff --git a/src/ride/thrill/motion_simulator.c b/src/ride/thrill/motion_simulator.c
index 2bfa440d85..3423b59672 100644
--- a/src/ride/thrill/motion_simulator.c
+++ b/src/ride/thrill/motion_simulator.c
@@ -47,7 +47,7 @@ static void paint_motionsimulator_vehicle(sint8 offsetX, sint8 offsetY, uint8 di
 		uint16 spriteIndex = ride->vehicles[0];
 		if (spriteIndex != SPRITE_INDEX_NULL) {
 			vehicle = GET_VEHICLE(spriteIndex);
-			RCT2_GLOBAL(0x009DE570, uint8) = 2;
+			RCT2_GLOBAL(RCT2_ADDRESS_PAINT_SETUP_CURRENT_TYPE, uint8) = 2;
 			RCT2_GLOBAL(0x009DE578, rct_vehicle*) = vehicle;
 		}
 	}
diff --git a/src/scenario.c b/src/scenario.c
index 4c2cba8b37..6d41af4005 100644
--- a/src/scenario.c
+++ b/src/scenario.c
@@ -259,7 +259,7 @@ void scenario_begin()
 	gScenarioCompletedCompanyValue = MONEY32_UNDEFINED;
 	gTotalAdmissions = 0;
 	gTotalIncomeFromAdmissions = 0;
-	RCT2_GLOBAL(0x013587D8, uint16) = 63;
+	RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_COMPLETED_BY, uint16) = 63;
 	finance_update_loan_hash();
 	park_reset_history();
 	finance_reset_history();