Fix the URL's