SASL fixes backports