g2: fixup all other variants