Fix URI creation