More plotting tweaks