Ontology & config fixes