More tweaks to demo.