Various Changes While Fixing GroupBy