HTTPS fixes