Various updates to pillar and salt