OntologyProvider fixes