Various tweaks for demo