Fixes for ICD10 release.