Better iPhone 6 support