More Salt Master Changes