Plotting fixes