Fix some bugs in the social upgrade, as found during a large upgrade.