sasl fixes