diff --git a/src/ride/ride.c b/src/ride/ride.c
index 0ddf613ac3..b685915043 100644
--- a/src/ride/ride.c
+++ b/src/ride/ride.c
@@ -885,8 +885,8 @@ int ride_modify(rct_map_element *mapElement, int x, int y)
 	if (ride->type == RIDE_TYPE_MAZE)
 		return ride_modify_maze(mapElement, x, y);
 
-	if (RCT2_GLOBAL(0x0097CF40 + (ride->type * 8), uint32) & 0x100) {
-		int outX, outY;
+	if (RCT2_ADDRESS(RCT2_ADDRESS_RIDE_FLAGS,uint64)[ride->type] & 0x100) {
+		int outX = x, outY = y;
 		mapElement = ride_find_track_gap(mapElement, &outX, &outY);
 	}
 
diff --git a/src/windows/ride_construction.c b/src/windows/ride_construction.c
index 22c0b2caf1..2e9a31a637 100644
--- a/src/windows/ride_construction.c
+++ b/src/windows/ride_construction.c
@@ -139,7 +139,7 @@ rct_window *window_construction_open()
 	w = window_create(0, 29, 166, 394, (uint32*)window_construction_events, WC_RIDE_CONSTRUCTION, WF_9);
 
 	w->widgets = (rct_widget*)0x9D7A90;
-	w->enabled_widgets = 0x67C4FFFFEF;
+	w->enabled_widgets = 0x67EFFFFFC4;
 
 	window_init_scroll_widgets(w);