Esgf fixes