Improve handling of JobPhase metadata issues