Various fixes for demo