More quickstart changes