Fix for SSL issues