Better support HTTPS and HTTP URLs