Yet more fixes for URLs.