WIP on complete platform fixup