Fixes for IOS