Fix URI Handling