Last pre-demo tweaks