Some more plotting fixes.