probably fixed imporoperly handled non-unicode strings in split_uri; shame on them if i did!