Minor changes to demo app