uri bugfixes?