Quickstart fixes