Report and group fixes