Minor cleanup around URI