Group Fixes

Fixed a few errant group assignments