Fix two more groupBy method overload return types

Fix two more groupBy method overload return types