fixes for IOS