Fix some modifications in GFS between recent commits