diff --git a/src/Core/OOConstToString.m b/src/Core/OOConstToString.m
index daee42b4..51c20e50 100644
--- a/src/Core/OOConstToString.m
+++ b/src/Core/OOConstToString.m
@@ -420,7 +420,7 @@ NSString *CommodityTypeToString(OOCommodityType commodity) // returns the commod
 		CO_CASE(GOLD);
 		CO_CASE(PLATINUM);
 			
-		case CARGO_UNDEFINED:
+		case COMMODITY_UNDEFINED:
 			break;
 	}
 	return @"unknown commodity";
diff --git a/src/Core/Universe.m b/src/Core/Universe.m
index 499df4e3..1db066c2 100644
--- a/src/Core/Universe.m
+++ b/src/Core/Universe.m
@@ -3175,6 +3175,8 @@ static BOOL IsCandidateMainStationPredicate(Entity *entity, void *parameter)
 		case COMMODITY_GOLD:
 		case COMMODITY_PLATINUM:
 			return UNITS_KILOGRAMS;
+		default:
+			break;
 	}
 	// default
 	return UNITS_TONS;