Fixed more internal url problems