More improvements for the Uri package.