Minor changes to Group, Person & Room