Fixes during group coding