Removed use of join2 which is broken in non-ff-extension mode and just used join. Also s/.Util.uri/.uri/
Fix conflict