More HTTPS changes