Fix up the URL stuff