Various fixes for the demo