Uri fixes