diff --git a/src/ai/api/ai_order.cpp b/src/ai/api/ai_order.cpp
index aa91a539ab..fcf1658fee 100644
--- a/src/ai/api/ai_order.cpp
+++ b/src/ai/api/ai_order.cpp
@@ -198,7 +198,7 @@ static const Order *ResolveOrder(VehicleID vehicle_id, AIOrder::OrderPosition or
 			}
 			return INVALID_TILE;
 		}
-		case OT_GOTO_WAYPOINT: return v->type == VEH_TRAIN ? ::Waypoint::Get(order->GetDestination())->xy : ::Station::Get(order->GetDestination())->xy;
+		case OT_GOTO_WAYPOINT: return ::Waypoint::Get(order->GetDestination())->xy;
 		default:               return INVALID_TILE;
 	}
 }
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 6f53d14207..e5d0215976 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -352,7 +352,7 @@ static Station *GetClosestDeletedStation(TileIndex tile)
 	Station *st;
 
 	FOR_ALL_STATIONS(st) {
-		if (st->facilities == 0 && st->owner == _current_company) {
+		if (!st->IsInUse() && st->owner == _current_company) {
 			uint cur_dist = DistanceManhattan(tile, st->xy);
 
 			if (cur_dist < threshold) {
@@ -420,11 +420,7 @@ void UpdateAllStationVirtCoords()
 {
 	BaseStation *st;
 
-	FOR_ALL_STATIONS(st) {
-		st->UpdateVirtCoord();
-	}
-
-	FOR_ALL_WAYPOINTS(st) {
+	FOR_ALL_BASE_STATIONS(st) {
 		st->UpdateVirtCoord();
 	}
 }
@@ -628,7 +624,7 @@ static void UpdateStationSignCoord(Station *st)
  */
 static void DeleteStationIfEmpty(Station *st)
 {
-	if (st->facilities == 0) {
+	if (!st->IsInUse()) {
 		st->delete_ctr = 0;
 		InvalidateWindowData(WC_STATION_LIST, st->owner, 0);
 	}
@@ -2951,7 +2947,7 @@ void DeleteOilRig(TileIndex tile)
 
 	st->UpdateVirtCoord();
 	st->RecomputeIndustriesNear();
-	if (st->facilities == 0) delete st;
+	if (!st->IsInUse()) delete st;
 }
 
 static void ChangeTileOwner_Station(TileIndex tile, Owner old_owner, Owner new_owner)
diff --git a/src/viewport.cpp b/src/viewport.cpp
index 29f1524f24..9b59e496c4 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -1092,7 +1092,7 @@ static void ViewportAddTownNames(DrawPixelInfo *dpi)
 
 static void AddStation(const Station *st, StringID str, uint16 width)
 {
-	AddStringToDraw(st->sign.left + 1, st->sign.top + 1, str, st->index, st->facilities, (st->owner == OWNER_NONE || st->facilities == 0) ? 0xE : _company_colours[st->owner], width);
+	AddStringToDraw(st->sign.left + 1, st->sign.top + 1, str, st->index, st->facilities, (st->owner == OWNER_NONE || !st->IsInUse()) ? 0xE : _company_colours[st->owner], width);
 }