Setup fixes to make the site upgradable