Making the demo app work better on iOS 5.1