Fixed some issues Add group