Fix up platform selection