More fixes to the plotting tools