Bugfixes for new install of app