Fixed up remaining url redirects