Fixes for ready to use demo