Tweaks to demo