Group cleanups and fixes