More fixes for the HTTPS compatibility