Minor demo tweaks