Even more url fixes.