Fix some mixed content problems
Merge pull request #501 from strugee/fix-mixed-content

Fix some mixed content problems