Various fixups to salt setup