Some updates for SASL