More SASL work