Performance improvements

Changing URLs to avoid redirects.