Continued fixes of salt-master goodness