Additional iOS 5 support improvements