diff --git a/src/ride/track.c b/src/ride/track.c
index a808878544..0d46dc8bff 100644
--- a/src/ride/track.c
+++ b/src/ride/track.c
@@ -1450,6 +1450,10 @@ int track_place_maze(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint8** trac
 				continue;
 			if (mapCoord.y > 0x1FFF)
 				continue;
+			if (mapCoord.x < 0)
+				continue;
+			if (mapCoord.y < 0)
+				continue;
 
 			rct_map_element* map_element = map_get_surface_element_at(mapCoord.x / 32, mapCoord.y / 32);
 
@@ -1645,8 +1649,17 @@ int track_place_ride(sint16 x, sint16 y, sint16 z, uint8 rideIndex, uint8** trac
 				if (tile.y > 0x1FFF)
 					continue;
 
+				if (tile.x < 0)
+					continue;
+
+				if (tile.y < 0)
+					continue;
+
 				rct_map_element* map_element = map_get_surface_element_at(tile.x / 32, tile.y / 32);
 
+				if (map_element == NULL)
+					return 0;
+
 				int height = map_element->base_height * 8;
 				if (map_element->properties.surface.slope & 0xF){
 					height += 16;
@@ -1900,8 +1913,8 @@ int sub_6D01B3(uint8 bl, uint8 rideIndex, int x, int y, int z)
 
 	//0x6D0FE6
 	if (RCT2_GLOBAL(0x00F440D4, uint8) == 0){
-		RCT2_GLOBAL(0x009DE58A, uint16) |= 0x6;
-		RCT2_GLOBAL(0x009DE58A, uint16) &= ~(1 << 3);
+		RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_FLAGS, uint16) |= 0x6;
+		RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_FLAGS, uint16) &= ~(1 << 3);
 		map_invalidate_map_selection_tiles();
 	}
 
@@ -2574,8 +2587,8 @@ int maze_ride_to_td6(uint8 rideIndex, rct_track_td6* track_design, uint8* track_
 	// no need since global vars not used
 	sub_6D01B3(0, 0, 4096, 4096, 0);
 
-	RCT2_GLOBAL(0x009DE58A, sint16) &= 0xFFF9;
-	RCT2_GLOBAL(0x009DE58A, sint16) &= 0xFFF7;
+	RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_FLAGS, sint16) &= 0xFFF9;
+	RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_FLAGS, sint16) &= 0xFFF7;
 
 	x = RCT2_GLOBAL(RCT2_ADDRESS_TRACK_PREVIEW_X_MAX, sint16) -
 		RCT2_GLOBAL(RCT2_ADDRESS_TRACK_PREVIEW_X_MIN, sint16);
@@ -2833,8 +2846,8 @@ int tracked_ride_to_td6(uint8 rideIndex, rct_track_td6* track_design, uint8* tra
 	RCT2_GLOBAL(0x00F44144, sint16) = start_y;
 	RCT2_GLOBAL(0x00F44146, sint16) = start_z;
 
-	RCT2_GLOBAL(0x009DE58A, sint16) &= 0xFFF9;
-	RCT2_GLOBAL(0x009DE58A, sint16) &= 0xFFF7;
+	RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_FLAGS, sint16) &= 0xFFF9;
+	RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_FLAGS, sint16) &= 0xFFF7;
 
 	x = RCT2_GLOBAL(RCT2_ADDRESS_TRACK_PREVIEW_X_MAX, sint16) -
 		RCT2_GLOBAL(RCT2_ADDRESS_TRACK_PREVIEW_X_MIN, sint16);
diff --git a/src/windows/ride_construction.c b/src/windows/ride_construction.c
index 15eaef3b6d..9a07407735 100644
--- a/src/windows/ride_construction.c
+++ b/src/windows/ride_construction.c
@@ -203,6 +203,7 @@ rct_window *window_construction_open()
 	return w;
 }
 
+/* rct2: 0x006C845D */
 void window_construction_close()
 {
 	rct_window *w;
@@ -214,7 +215,11 @@ void window_construction_close()
 	viewport_set_visibility(0);
 
 	map_invalidate_map_selection_tiles();
-	RCT2_GLOBAL(0x9DE58A, uint16) &= 0xFFFD;
+	RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_FLAGS, uint16) &= ~(1 << 1);
+
+	// In order to cancel the yellow arrow correctly the
+	// selection tool should be cancelled.
+	tool_cancel();
 
 	hide_gridlines();
 
@@ -242,7 +247,11 @@ void window_construction_maze_close(){
 	viewport_set_visibility(0);
 
 	map_invalidate_map_selection_tiles();
-	RCT2_GLOBAL(0x9DE58A, uint16) &= 0xFFFD;
+	RCT2_GLOBAL(RCT2_ADDRESS_MAP_SELECTION_FLAGS, uint16) &= ~(1 << 1);
+
+	// In order to cancel the yellow arrow correctly the
+	// selection tool should be cancelled.
+	tool_cancel();
 
 	hide_gridlines();
 
diff --git a/src/world/map.c b/src/world/map.c
index 67c6aaacb4..35e3eda5a5 100644
--- a/src/world/map.c
+++ b/src/world/map.c
@@ -164,6 +164,9 @@ rct_map_element *map_get_surface_element_at(int x, int y)
 {
 	rct_map_element *mapElement = map_get_first_element_at(x, y);
 
+	if (mapElement == NULL)
+		return NULL;
+
 	// Find the first surface element
 	while (map_element_get_type(mapElement) != MAP_ELEMENT_TYPE_SURFACE) {
 		if (map_element_is_last_for_tile(mapElement))
@@ -178,6 +181,9 @@ rct_map_element *map_get_surface_element_at(int x, int y)
 rct_map_element* map_get_path_element_at(int x, int y, int z){
 	rct_map_element *mapElement = map_get_first_element_at(x, y);
 
+	if (mapElement == NULL)
+		return NULL;
+
 	uint8 mapFound = 0;
 	// Find the path element at known z
 	do {