Small final fixes related to RDF output