Fix URI issues