FhirClient fixes (part 1)