Improve uri handling.