A few more fixes to the Demo project