Fixed URI issues