More SSL fixes