Fix fallout from userclass addition