fixed some uri issues