Few enhancements for SSL