diff --git a/src/depot_map.h b/src/depot_map.h
index e55994869a..c304790f8a 100644
--- a/src/depot_map.h
+++ b/src/depot_map.h
@@ -29,6 +29,9 @@ static inline bool IsDepotTypeTile(TileIndex tile, TransportType type)
 
 		case TRANSPORT_WATER:
 			return IsShipDepotTile(tile);
+
+		case TRANSPORT_AIR:
+			return IsHangarTile(tile);
 	}
 }
 
@@ -58,7 +61,7 @@ static inline DepotID GetDepotIndex(TileIndex t)
 /**
  * Get the type of vehicles that can use a depot
  * @param t The tile
- * @pre IsRailDepotTile(t) || IsRoadDepotTile(t) || IsShipDepotTile(t) || IsTileType(t, MP_STATION)
+ * @pre IsDepotTile(t)
  * @return the type of vehicles that can use the depot
  */
 static inline VehicleType GetDepotVehicleType(TileIndex t)
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index e69f229f02..b5fd63731f 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -410,7 +410,8 @@ static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile)
 		return order;
 	}
 
-	if ((IsBuoyTile(tile) && v->type == VEH_SHIP) || (IsRailWaypointTile(tile) && v->type == VEH_TRAIN)) {
+	/* check buoy (no ownership) */
+	if (IsBuoyTile(tile) && v->type == VEH_SHIP) {
 		order.MakeGoToWaypoint(GetStationIndex(tile));
 		return order;
 	}