More changes to fix broken URLs.