Final demo tweaks