More changes to get SSL working with 2.x.x