Fix group bugs