More fixes to new TLS.