Updated uri so that it would compile on GCC 4.7.2 given the last changes.