Added FHIR schema fixes, to be run on FHIR schema