Bugfix to Contact upgrades

Should get squashed