Fix unrelated group problems

Bad naming meant a group wasn't showing up here. Also attempts to
add back all the changes that have been manually introduced.