fix some issues with upgrade/initial setup, #940