More 'rdf' fixes