Grouplist fixes