Fixes for the demo