few URI fixes