Again fixes to demo