Fixed create and delete of groups