Fixed references to uri-to-string