Ontology Adapter fixes