some fixes for the new version of gf