More plotter bug fixes