Image fix and MCF check pass