Fix some mixed content problems