Minor updates as we transition to new GFF format for data