Small tweaks to demo