Fixing some things in the demo project to be iOS7-friendly