Hopefully last changes to plot methods