Minor fixes for plotting