Demo minor tweaks