Patch/sasl improvements