More ssl fixes