Plotting legend fixes