Minor changes to plotting