Fixing IOS bugs