Some tweaks for demo