Fix xcode 5.1.1 builds

Some iPhone 6 changes broke 5.1.1 compatibility.