More url() fixes