More work on sasl & tls