Changes for SSL clients