Bug fixes in UriParser.java