Some improvements w.r.t. URIs