More SSL changes