Improvements for pre iOS 8