Minor fixes in the demo project