Updating more uri|location references