fix several issues in r2rml