Minor tweaks to demo files