Small fixes for nicer plots