More URI Fixes