Ontology fixes