Minor plotter fixes and cleanup