Fixes for iOS