Fixed a number of small issues in the URIs