Sasl related fixes