Tweaks to the demo application