Small demo tweaks