Minor salting changes
Merge