Graphing bug fixes