fixes to make the demo build and start