diff --git a/src/newgrf_debug_gui.cpp b/src/newgrf_debug_gui.cpp
index b53c2ae5b7..703edf9053 100644
--- a/src/newgrf_debug_gui.cpp
+++ b/src/newgrf_debug_gui.cpp
@@ -624,7 +624,7 @@ struct SpriteAlignerWindow : Window {
 				int step_size = nwid->resize_y;
 
 				SmallVector<SpriteID, 256> &list = _newgrf_debug_sprite_picker.sprites;
-				int max = min(this->vscroll.GetPosition() + this->vscroll.GetCapacity(), list.Length());
+				int max = min<int>(this->vscroll.GetPosition() + this->vscroll.GetCapacity(), list.Length());
 
 				int y = r.top + WD_FRAMERECT_TOP;
 				for (int i = this->vscroll.GetPosition(); i < max; i++) {
diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp
index ae5c36ac18..e82f7e26ec 100644
--- a/src/saveload/waypoint_sl.cpp
+++ b/src/saveload/waypoint_sl.cpp
@@ -73,7 +73,7 @@ void MoveWaypointsToBaseStations()
 			if (wp->delete_ctr != 0) continue; // The waypoint was deleted
 
 			/* Waypoint indices were not added to the map prior to this. */
-			_m[wp->xy].m2 = wp->index;
+			_m[wp->xy].m2 = (StationID)wp->index;
 
 			if (HasBit(_m[wp->xy].m3, 4)) {
 				wp->spec = GetCustomStationSpec(STAT_CLASS_WAYP, _m[wp->xy].m4 + 1);