IOS improvements