Platform type consistency

Manually merged #455. Waiting for internal QA from GarageGames to merge this.