More fixes to user upgrading.