Quickstart improvements