Fixes for the ontology