More plotting fixes for FI analysis.