Misc fixes for the demo