Minor changes to the demo app