Fix URI semantics