Graphing Fixes