Fix some URI formatting issues