Fix incorrect salt states, add null builder to packer