Getting started improvments