IOS build improvements