Tweaks to statefiles for salting the salt master