IOS fixes