iOS 8 Compatibility Fixes