other fixes for the demo