Fix issues with new group validation