More demo tweaks.