Improved iOS 8 support logic