Fixed iPhone 6 issues