Group assignment fixes