Ontology & mapping fixes