diff --git a/src/saveload/waypoint_sl.cpp b/src/saveload/waypoint_sl.cpp
--- a/src/saveload/waypoint_sl.cpp
+++ b/src/saveload/waypoint_sl.cpp
@@ -47,7 +47,7 @@ static void UpdateWaypointOrder(Order *o
 	for (OldWaypoint *wp = _old_waypoints.Begin(); wp != _old_waypoints.End(); wp++) {
 		if (wp->index != o->GetDestination()) continue;
 
-		o->SetDestination(wp->new_index);
+		o->SetDestination((DestinationID)wp->new_index);
 		return;
 	}
 }
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -615,7 +615,7 @@ public:
 
 				if (x >= 10) {
 					/* Increase button clicked */
-					val = min(val + sdb->interval, sdb->max);
+					val = min(val + sdb->interval, (int32)sdb->max);
 					this->clicked_increase = true;
 				} else {
 					/* Decrease button clicked */