Fixed some group related stuff