Fix usergroups bug
Fix another bug
Minor clean up.
Various