Fixes for iOS project