Minor changes to plotting functionality