Minor fixes to demo