Fixed references to GroupRole, Grant and GroupMembership types..