Fix iPhone 4 issues