SONAR issue fixes for metadata comparison.