Some fixes

This pull request contains some fixes.
this function actually returning a Builder and not an URI. If you don't need the builder, return the URI directly or rename this function