Small fixes to demo project