SPF and SSL fixes