Adjustments to play nicely and remove warnings in iOS 6.0.