A couple of tweaks to demo templates