Fixes for RPCWALLET