fixes for the demo