Start fixing sasl support