Fix graph display compilation bugs
Merge branch 'graph-cleanup' into merge-from-standard