Migration fixes

For Samples > 22 Color > AnalysisDisplay