Bug fixes for demos