fixes to the group mapping code.