Consistent platforms: Unbreak the build