More work on enabling sasl support