More fixes to plot limits