Fixes to GFF mode