A few tweaks to allow SSL