Tweaks to demo.