Adds support for salt keys, fixes return codes from wipevm