More fixes for SSL