Sync with other changes.
Mod so it starts to build on iOS.