More switching of user objects from save to patch.