Fixes in graph plotter