Further changes to quickstart