fix up some g2 stuff