Fixes after Vault of Satoshi integration