Minor tweaks to group which didn't get trought previous commit