Tweaks and fixes for the demo