g2: more fixes for eos