Adding first of the fixes for SSL.