More build fixes for iOS