Fix notes from PR, need to review SASL as its not working