Tweaks to plotting