diff --git a/src/openrct2/windows/EditorBottomToolbar.cpp b/src/openrct2/windows/EditorBottomToolbar.cpp
index a859ffdf00..3fe1df878c 100644
--- a/src/openrct2/windows/EditorBottomToolbar.cpp
+++ b/src/openrct2/windows/EditorBottomToolbar.cpp
@@ -183,7 +183,7 @@ static void window_editor_bottom_toolbar_jump_back_to_invention_list_set_up() {
 
 /**
 *
-*  rct2: 0x0066F64E
+*  rct2: 0x0066F666
 */
 void window_editor_bottom_toolbar_jump_back_to_options_selection() {
     window_close_all();
diff --git a/src/openrct2/windows/TileInspector.cpp b/src/openrct2/windows/TileInspector.cpp
index 6ec42f406f..5e4bc718d5 100644
--- a/src/openrct2/windows/TileInspector.cpp
+++ b/src/openrct2/windows/TileInspector.cpp
@@ -1652,7 +1652,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi)
 
             // Edge texture name
             sint32 idx = map_element_get_terrain_edge(mapElement);
-            openrct2_assert(idx < Util::CountOf(TerrainEdgeTypeStringIds), "Tried accessing invalid entry %d in terrainEdgeTypeStringIds", idx);
+            openrct2_assert((uint32)idx < Util::CountOf(TerrainEdgeTypeStringIds), "Tried accessing invalid entry %d in terrainEdgeTypeStringIds", idx);
             rct_string_id terrainEdgeNameId = TerrainEdgeTypeStringIds[map_element_get_terrain_edge(mapElement)];
             gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_EDGE, &terrainEdgeNameId, COLOUR_DARK_GREEN, x, y + 11);
 
diff --git a/src/openrct2/windows/TopToolbar.cpp b/src/openrct2/windows/TopToolbar.cpp
index 4373192ba6..f8517b8ee9 100644
--- a/src/openrct2/windows/TopToolbar.cpp
+++ b/src/openrct2/windows/TopToolbar.cpp
@@ -2788,7 +2788,7 @@ static void window_top_toolbar_water_tool_drag(sint16 x, sint16 y)
     if (!viewport)
         return;
 
-    sint16 dx = (sint16)(uint16)0xFFF0;
+    sint16 dx = -16;
     dx >>= viewport->zoom;
 
     y -= gInputDragLastY;