Tweaks to make the demo work better