Small changes for first run of app