Fixes to graphing