Minor mods to plotting functions