Fix some mixed content issues