Fixes for errors in the demo