Fixes for a quick start demo.