Fixing up some stuff on sasl init.