Fixes to graph