Some fixes in drawing the plot.