group related fixes