Minor mods for plotting