Fix issues with SSL Handshake failures