More TLS related changes