Improved the way in which we compute various URIs