fixes to help with new UserGroup setup