More changes to make setup of the app smoother.