Fixes to quickstart