Small changes to plotting