diff --git a/src/bloom.cpp b/src/bloom.cpp
index 24eebe2e3..d3504f98e 100644
--- a/src/bloom.cpp
+++ b/src/bloom.cpp
@@ -3,6 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bloom.h>
+#include <nameclaim.h>
 
 #include <primitives/transaction.h>
 #include <hash.h>
@@ -166,7 +167,8 @@ bool CBloomFilter::IsRelevantAndUpdate(const CTransaction& tx)
                 {
                     txnouttype type;
                     std::vector<std::vector<unsigned char> > vSolutions;
-                    if (Solver(txout.scriptPubKey, type, vSolutions) &&
+                    const CScript& scriptPubKey = StripClaimScriptPrefix(txout.scriptPubKey);
+                    if (Solver(scriptPubKey, type, vSolutions) &&
                             (type == TX_PUBKEY || type == TX_MULTISIG))
                         insert(COutPoint(hash, i));
                 }
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 1442e783d..dd9b33ab5 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -145,6 +145,7 @@ public:
         consensus.nNormalizedNameForkHeight = 539940; // targeting 21 March 2019
         consensus.nMinTakeoverWorkaroundHeight = 496850;
         consensus.nMaxTakeoverWorkaroundHeight = 10000000;
+        consensus.nWitnessForkHeight = 700000;
         consensus.fPowAllowMinDifficultyBlocks = false;
         consensus.fPowNoRetargeting = false;
         consensus.nRuleChangeActivationThreshold = 1916; // 95% of a  half week
@@ -158,7 +159,7 @@ public:
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1462060800; // May 1st, 2016
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017
 
-        // Deployment of SegWit (BIP141, BIP143, and BIP147)
+        // Deployment of SegWit (BIP141, BIP143, and BIP147) -- Unused (see nWitnessForkHeight).
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1;
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1547942400; // Jan 20, 2019
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1548288000; // Jan 24, 2019
@@ -262,6 +263,7 @@ public:
         consensus.nNormalizedNameForkHeight = 993380;   // targeting, 21 Feb 2019
         consensus.nMinTakeoverWorkaroundHeight = 99;
         consensus.nMaxTakeoverWorkaroundHeight = 10000000;
+        consensus.nWitnessForkHeight = 1600000;
         consensus.fPowAllowMinDifficultyBlocks = true;
         consensus.fPowNoRetargeting = false;
         consensus.nRuleChangeActivationThreshold = 1512; // 75% for testchains
@@ -275,7 +277,7 @@ public:
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1456790400; // March 1st, 2016
         consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017
 
-        // Deployment of SegWit (BIP141, BIP143, and BIP147)
+        // Deployment of SegWit (BIP141, BIP143, and BIP147) -- Unused (see nWitnessForkHeight).
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1;
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1462060800; // May 1st 2016
         consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1493596800; // May 1st 2017
@@ -367,6 +369,7 @@ public:
         consensus.nNormalizedNameForkHeight = 250; // SDK depends upon this number
         consensus.nMinTakeoverWorkaroundHeight = -1;
         consensus.nMaxTakeoverWorkaroundHeight = -1;
+        consensus.nWitnessForkHeight = 150;
         consensus.fPowAllowMinDifficultyBlocks = false;
         consensus.fPowNoRetargeting = false;
         consensus.nRuleChangeActivationThreshold = 108; // 75% for testchains
diff --git a/src/claimscriptop.h b/src/claimscriptop.h
index 7fc93048a..afea2930c 100644
--- a/src/claimscriptop.h
+++ b/src/claimscriptop.h
@@ -59,17 +59,17 @@ public:
      */
     CClaimScriptAddOp(const COutPoint& point, CAmount nValue, int nHeight);
     /**
-     * Implamention of OP_CLAIM_NAME handler
+     * Implementation of OP_CLAIM_NAME handler
      * @see CClaimScriptOp::claimName
      */
     bool claimName(CClaimTrieCache& trieCache, const std::string& name) override;
     /**
-     * Implamention of OP_UPDATE_CLAIM handler
+     * Implementation of OP_UPDATE_CLAIM handler
      * @see CClaimScriptOp::updateClaim
      */
     bool updateClaim(CClaimTrieCache& trieCache, const std::string& name, const uint160& claimId) override;
     /**
-     * Implamention of OP_SUPPORT_CLAIM handler
+     * Implementation of OP_SUPPORT_CLAIM handler
      * @see CClaimScriptOp::supportClaim
      */
     bool supportClaim(CClaimTrieCache& trieCache, const std::string& name, const uint160& claimId) override;
@@ -100,17 +100,17 @@ public:
      */
     CClaimScriptUndoAddOp(const COutPoint& point, int nHeight);
     /**
-     * Implamention of OP_CLAIM_NAME handler
+     * Implementation of OP_CLAIM_NAME handler
      * @see CClaimScriptOp::claimName
      */
     bool claimName(CClaimTrieCache& trieCache, const std::string& name) override;
     /**
-     * Implamention of OP_UPDATE_CLAIM handler
+     * Implementation of OP_UPDATE_CLAIM handler
      * @see CClaimScriptOp::updateClaim
      */
     bool updateClaim(CClaimTrieCache& trieCache, const std::string& name, const uint160& claimId) override;
     /**
-     * Implamention of OP_SUPPORT_CLAIM handler
+     * Implementation of OP_SUPPORT_CLAIM handler
      * @see CClaimScriptOp::supportClaim
      */
     bool supportClaim(CClaimTrieCache& trieCache, const std::string& name, const uint160& claimId) override;
@@ -141,17 +141,17 @@ public:
      */
     CClaimScriptSpendOp(const COutPoint& point, int nHeight, int& nValidHeight);
     /**
-     * Implamention of OP_CLAIM_NAME handler
+     * Implementation of OP_CLAIM_NAME handler
      * @see CClaimScriptOp::claimName
      */
     bool claimName(CClaimTrieCache& trieCache, const std::string& name) override;
     /**
-     * Implamention of OP_UPDATE_CLAIM handler
+     * Implementation of OP_UPDATE_CLAIM handler
      * @see CClaimScriptOp::updateClaim
      */
     bool updateClaim(CClaimTrieCache& trieCache, const std::string& name, const uint160& claimId) override;
     /**
-     * Implamention of OP_SUPPORT_CLAIM handler
+     * Implementation of OP_SUPPORT_CLAIM handler
      * @see CClaimScriptOp::supportClaim
      */
     bool supportClaim(CClaimTrieCache& trieCache, const std::string& name, const uint160& claimId) override;
@@ -184,17 +184,17 @@ public:
      */
     CClaimScriptUndoSpendOp(const COutPoint& point, CAmount nValue, int nHeight, int nValidHeight);
     /**
-     * Implamention of OP_CLAIM_NAME handler
+     * Implementation of OP_CLAIM_NAME handler
      * @see CClaimScriptOp::claimName
      */
     bool claimName(CClaimTrieCache& trieCache, const std::string& name) override;
     /**
-     * Implamention of OP_UPDATE_CLAIM handler
+     * Implementation of OP_UPDATE_CLAIM handler
      * @see CClaimScriptOp::updateClaim
      */
     bool updateClaim(CClaimTrieCache& trieCache, const std::string& name, const uint160& claimId) override;
     /**
-     * Implamention of OP_SUPPORT_CLAIM handler
+     * Implementation of OP_SUPPORT_CLAIM handler
      * @see CClaimScriptOp::supportClaim
      */
     bool supportClaim(CClaimTrieCache& trieCache, const std::string& name, const uint160& claimId) override;
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 0bb2affc6..582159a27 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -81,6 +81,8 @@ struct Params {
     int nMinTakeoverWorkaroundHeight;
     int nMaxTakeoverWorkaroundHeight;
 
+    int nWitnessForkHeight;
+
     int64_t nPowTargetSpacing;
     int64_t nPowTargetTimespan;
     /** how long it took claims to expire before the hard fork */
diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp
index d80da5d1b..47c9d0248 100644
--- a/src/consensus/tx_verify.cpp
+++ b/src/consensus/tx_verify.cpp
@@ -154,7 +154,8 @@ int64_t GetTransactionSigOpCost(const CTransaction& tx, const CCoinsViewCache& i
         const Coin& coin = inputs.AccessCoin(tx.vin[i].prevout);
         assert(!coin.IsSpent());
         const CTxOut &prevout = coin.out;
-        nSigOps += CountWitnessSigOps(tx.vin[i].scriptSig, prevout.scriptPubKey, &tx.vin[i].scriptWitness, flags);
+        const CScript& scriptPubKey = StripClaimScriptPrefix(prevout.scriptPubKey);
+        nSigOps += CountWitnessSigOps(tx.vin[i].scriptSig, scriptPubKey, &tx.vin[i].scriptWitness, flags);
     }
     return nSigOps;
 }
diff --git a/src/core_write.cpp b/src/core_write.cpp
index 34a9d2360..df6897b0e 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -7,6 +7,7 @@
 #include <consensus/consensus.h>
 #include <consensus/validation.h>
 #include <key_io.h>
+#include <nameclaim.h>
 #include <script/script.h>
 #include <script/standard.h>
 #include <serialize.h>
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
index b00f5a03c..3e6e74955 100644
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -208,7 +208,7 @@ bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
         const CTxOut &prev = mapInputs.AccessCoin(tx.vin[i].prevout).out;
 
         // get the scriptPubKey corresponding to this input:
-        CScript prevScript = prev.scriptPubKey;
+        CScript prevScript = StripClaimScriptPrefix(prev.scriptPubKey);
 
         if (prevScript.IsPayToScriptHash()) {
             std::vector <std::vector<unsigned char> > stack;
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 9fa042016..489299f99 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -171,6 +171,9 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "rescanblockchain", 0, "start_height"},
     { "rescanblockchain", 1, "stop_height"},
     { "createwallet", 1, "disable_private_keys"},
+    { "listnameclaims", 0, "includesupports"},
+    { "listnameclaims", 1, "activeonly"},
+    { "listnameclaims", 2, "minconf"},
 };
 
 class CRPCConvertTable
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 2ea134818..9152d02de 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -4,6 +4,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <script/interpreter.h>
+#include <nameclaim.h>
 
 #include <crypto/ripemd160.h>
 #include <crypto/sha1.h>
@@ -1505,10 +1506,13 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C
         return set_error(serror, SCRIPT_ERR_EVAL_FALSE);
 
     // Bare witness programs
+
+    const CScript& strippedScriptPubKey = StripClaimScriptPrefix(scriptPubKey);
+
     int witnessversion;
     std::vector<unsigned char> witnessprogram;
     if (flags & SCRIPT_VERIFY_WITNESS) {
-        if (scriptPubKey.IsWitnessProgram(witnessversion, witnessprogram)) {
+        if (strippedScriptPubKey.IsWitnessProgram(witnessversion, witnessprogram)) {
             hadWitness = true;
             if (scriptSig.size() != 0) {
                 // The scriptSig must be _exactly_ CScript(), otherwise we reintroduce malleability.
@@ -1524,7 +1528,7 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C
     }
 
     // Additional validation for spend-to-script-hash transactions:
-    if ((flags & SCRIPT_VERIFY_P2SH) && scriptPubKey.IsPayToScriptHash())
+    if ((flags & SCRIPT_VERIFY_P2SH) && strippedScriptPubKey.IsPayToScriptHash())
     {
         // scriptSig must be literals-only or validation fails
         if (!scriptSig.IsPushOnly())
diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp
index 99718d0ac..af0652ecf 100644
--- a/src/script/ismine.cpp
+++ b/src/script/ismine.cpp
@@ -40,8 +40,6 @@ enum class IsMineResult
     WATCH_ONLY = 1,  //! Included in watch-only balance
     SPENDABLE = 2,   //! Included in all balances
     INVALID = 3,     //! Not spendable by anyone (uncompressed pubkey in segwit, P2SH inside P2SH or witness, witness inside witness)
-    CLAIM = 4,
-    SUPPORT = 5,
 };
 
 bool PermitsUncompressed(IsMineSigVersion sigversion)
@@ -60,17 +58,11 @@ bool HaveKeys(const std::vector<valtype>& pubkeys, const CKeyStore& keystore)
 
 IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey, IsMineSigVersion sigversion)
 {
-    int op = 0;
     IsMineResult ret = IsMineResult::NO;
 
-    CScript strippedScriptPubKey = StripClaimScriptPrefix(scriptPubKey, op);
-    IsMineResult claim_ret = ((op == OP_CLAIM_NAME || op == OP_UPDATE_CLAIM) ? IsMineResult::CLAIM :
-                 ((op == OP_SUPPORT_CLAIM) ? IsMineResult::SUPPORT :
-                  IsMineResult::NO));
-
     std::vector<valtype> vSolutions;
     txnouttype whichType;
-    Solver(strippedScriptPubKey, whichType, vSolutions);
+    Solver(scriptPubKey, whichType, vSolutions);
 
     CKeyID keyID;
     switch (whichType)
@@ -85,7 +77,7 @@ IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey,
             return IsMineResult::INVALID;
         }
         if (keystore.HaveKey(keyID)) {
-            ret = std::max(claim_ret, IsMineResult::SPENDABLE);
+            ret = std::max(ret, IsMineResult::SPENDABLE);
         }
         break;
     case TX_WITNESS_V0_KEYHASH:
@@ -100,10 +92,6 @@ IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey,
             // This also applies to the P2WSH case.
             break;
         }
-        // Claims are not explicitly supported on Witness v0
-        // Transactions, and instead of supporting the wrapped inner
-        // tx, we are ignoring this type at this time (consistent with
-        // previous releases).
         ret = std::max(ret, IsMineInner(keystore, GetScriptForDestination(CKeyID(uint160(vSolutions[0]))), IsMineSigVersion::WITNESS_V0));
         break;
     }
@@ -116,7 +104,7 @@ IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey,
             }
         }
         if (keystore.HaveKey(keyID)) {
-            ret = std::max(claim_ret, IsMineResult::SPENDABLE);
+            ret = std::max(ret, IsMineResult::SPENDABLE);
         }
         break;
     case TX_SCRIPTHASH:
@@ -128,7 +116,7 @@ IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey,
         CScriptID scriptID = CScriptID(uint160(vSolutions[0]));
         CScript subscript;
         if (keystore.GetCScript(scriptID, subscript)) {
-            ret = std::max(claim_ret, IsMineInner(keystore, subscript, IsMineSigVersion::P2SH));
+            ret = std::max(ret, IsMineInner(keystore, subscript, IsMineSigVersion::P2SH));
         }
         break;
     }
@@ -146,10 +134,6 @@ IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey,
         CScriptID scriptID = CScriptID(hash);
         CScript subscript;
         if (keystore.GetCScript(scriptID, subscript)) {
-            // Claims are not explicitly supported on Witness v0
-            // Transactions, and instead of supporting the wrapped inner
-            // tx, we are ignoring this type at this time (consistent with
-            // previous releases).
             ret = std::max(ret, IsMineInner(keystore, subscript, IsMineSigVersion::WITNESS_V0));
         }
         break;
@@ -176,14 +160,14 @@ IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey,
             }
         }
         if (HaveKeys(keys, keystore)) {
-            ret = std::max(claim_ret, IsMineResult::SPENDABLE);
+            ret = std::max(ret, IsMineResult::SPENDABLE);
         }
         break;
     }
     }
 
     if (ret == IsMineResult::NO && keystore.HaveWatchOnly(scriptPubKey)) {
-        ret = std::max(claim_ret, IsMineResult::WATCH_ONLY);
+        ret = std::max(ret, IsMineResult::WATCH_ONLY);
     }
     return ret;
 }
@@ -192,18 +176,22 @@ IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey,
 
 isminetype IsMine(const CKeyStore& keystore, const CScript& scriptPubKey)
 {
-    switch (IsMineInner(keystore, scriptPubKey, IsMineSigVersion::TOP)) {
+    isminetype flags = ISMINE_NO;
+    int op;
+    CScript strippedScriptPubKey = StripClaimScriptPrefix(scriptPubKey, op);
+    if (op == OP_CLAIM_NAME || op == OP_UPDATE_CLAIM)
+        flags = ISMINE_CLAIM;
+    else if (op == OP_SUPPORT_CLAIM)
+        flags = ISMINE_SUPPORT;
+
+    switch (IsMineInner(keystore, strippedScriptPubKey, IsMineSigVersion::TOP)) {
     case IsMineResult::INVALID:
     case IsMineResult::NO:
         return ISMINE_NO;
     case IsMineResult::WATCH_ONLY:
-        return ISMINE_WATCH_ONLY;
+        return ISMINE_WATCH_ONLY; // addresses we're watching are never considered our claim or support -- but should they be?
     case IsMineResult::SPENDABLE:
-        return ISMINE_SPENDABLE;
-    case IsMineResult::CLAIM:
-        return ISMINE_CLAIM;
-    case IsMineResult::SUPPORT:
-        return ISMINE_SUPPORT;
+        return isminetype(ISMINE_SPENDABLE | flags);
     }
     assert(false);
 }
diff --git a/src/script/ismine.h b/src/script/ismine.h
index 8c4e9f135..a15c531d4 100644
--- a/src/script/ismine.h
+++ b/src/script/ismine.h
@@ -21,7 +21,9 @@ enum isminetype
     ISMINE_SPENDABLE = 2,
     ISMINE_CLAIM = 4,
     ISMINE_SUPPORT = 8,
-    ISMINE_ALL = ISMINE_WATCH_ONLY | ISMINE_SPENDABLE
+    ISMINE_ALL = ISMINE_WATCH_ONLY | ISMINE_SPENDABLE,
+    ISMINE_STAKE = ISMINE_CLAIM | ISMINE_SUPPORT,
+    ISMINE_SPENDABLE_OR_STAKE = ISMINE_SPENDABLE | ISMINE_STAKE
 };
 /** used for bitflags of isminetype */
 typedef uint8_t isminefilter;
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index bfbf9f13d..f2a8aa580 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -6,6 +6,7 @@
 #include <script/standard.h>
 
 #include <crypto/sha256.h>
+#include <nameclaim.h>
 #include <pubkey.h>
 #include <script/script.h>
 #include <util.h>
@@ -29,6 +30,7 @@ const char* GetTxnOutputType(txnouttype t)
     switch (t)
     {
     case TX_NONSTANDARD: return "nonstandard";
+    case TX_CLAIM: return "claim";
     case TX_PUBKEY: return "pubkey";
     case TX_PUBKEYHASH: return "pubkeyhash";
     case TX_SCRIPTHASH: return "scripthash";
@@ -158,7 +160,10 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<std::v
     }
 
     vSolutionsRet.clear();
-    typeRet = TX_NONSTANDARD;
+
+    int op;
+    std::vector<std::vector<unsigned char> > vvchParams;
+    typeRet = (DecodeClaimScript(scriptPubKey, op, vvchParams)) ? TX_CLAIM : TX_NONSTANDARD;
     return false;
 }
 
diff --git a/src/script/standard.h b/src/script/standard.h
index b16ac83e7..017d27b75 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -56,6 +56,7 @@ static const unsigned int MANDATORY_SCRIPT_VERIFY_FLAGS = SCRIPT_VERIFY_P2SH;
 enum txnouttype
 {
     TX_NONSTANDARD,
+    TX_CLAIM,
     // 'standard' transaction types:
     TX_PUBKEY,
     TX_PUBKEYHASH,
diff --git a/src/versionbits.cpp b/src/versionbits.cpp
index b0d2bc8a1..2821f2a64 100644
--- a/src/versionbits.cpp
+++ b/src/versionbits.cpp
@@ -203,6 +203,11 @@ public:
 
 ThresholdState VersionBitsState(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::DeploymentPos pos, VersionBitsCache& cache)
 {
+    // Check if we've past a hardfork state for segwit.
+    if ((pos == Consensus::DEPLOYMENT_SEGWIT) && (pindexPrev != nullptr) &&
+        (pindexPrev->nHeight + 1 >= params.nWitnessForkHeight))
+        return ThresholdState::ACTIVE;
+
     return VersionBitsConditionChecker(pos).GetStateFor(pindexPrev, params, cache.caches[pos]);
 }
 
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index a55c53973..3c9203670 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -218,7 +218,7 @@ UniValue abortrescan(const JSONRPCRequest& request)
 static void ImportAddress(CWallet*, const CTxDestination& dest, const std::string& strLabel);
 static void ImportScript(CWallet* const pwallet, const CScript& script, const std::string& strLabel, bool isRedeemScript) EXCLUSIVE_LOCKS_REQUIRED(pwallet->cs_wallet)
 {
-    if (!isRedeemScript && ::IsMine(*pwallet, script) == ISMINE_SPENDABLE) {
+    if (!isRedeemScript && (::IsMine(*pwallet, script) & ISMINE_SPENDABLE)) {
         throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
     }
 
@@ -902,7 +902,7 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con
 
             CScript redeemDestination = GetScriptForDestination(redeem_id);
 
-            if (::IsMine(*pwallet, redeemDestination) == ISMINE_SPENDABLE) {
+            if (::IsMine(*pwallet, redeemDestination) & ISMINE_SPENDABLE) {
                 throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
             }
 
@@ -986,7 +986,7 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con
 
                 CScript pubKeyScript = GetScriptForDestination(pubkey_dest);
 
-                if (::IsMine(*pwallet, pubKeyScript) == ISMINE_SPENDABLE) {
+                if (::IsMine(*pwallet, pubKeyScript) & ISMINE_SPENDABLE) {
                     throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
                 }
 
@@ -1005,7 +1005,7 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con
                 // TODO Is this necessary?
                 CScript scriptRawPubKey = GetScriptForRawPubKey(pubKey);
 
-                if (::IsMine(*pwallet, scriptRawPubKey) == ISMINE_SPENDABLE) {
+                if (::IsMine(*pwallet, scriptRawPubKey) & ISMINE_SPENDABLE) {
                     throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
                 }
 
@@ -1071,7 +1071,7 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con
 
             // Import scriptPubKey only.
             if (pubKeys.size() == 0 && keys.size() == 0) {
-                if (::IsMine(*pwallet, script) == ISMINE_SPENDABLE) {
+                if (::IsMine(*pwallet, script) & ISMINE_SPENDABLE) {
                     throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
                 }
 
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index da549558f..d0e2b0a9b 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -480,7 +480,7 @@ static CTransactionRef SendMoney(CWallet * const pwallet, const CTxDestination &
     }
 
     // Parse Bitcoin address
-    CScript scriptPubKey = prefix + GetScriptForDestination(address);
+    const CScript scriptPubKey = prefix + GetScriptForDestination(address);
 
     // Create and send the transaction
     CReserveKey reservekey(pwallet);
@@ -513,16 +513,16 @@ UniValue claimname(const JSONRPCRequest& request)
         return NullUniValue;
     }
 
-    if (request.fHelp || request.params.size() != 3)
+    if (request.fHelp || (request.params.size() != 3 && request.params.size() != 4))
         throw std::runtime_error(
             "claimname \"name\" \"value\" amount\n"
             "\nCreate a transaction which issues a claim assigning a value to a name. The claim will be authoritative if the transaction amount is greater than the transaction amount of all other unspent transactions which issue a claim over the same name, and it will remain au\
 thoritative as long as it remains unspent and there are no other greater unspent transactions issuing a claim over the same name. The amount is a real and is rounded to the nearest 0.00000001\n"
             + HelpRequiringPassphrase(pwallet) +
             "\nArguments:\n"
-            "1. \"name\"  (string, required) The name to be assigned the value.\n"
-            "2. \"value\"  (string, required) The value to assign to the name encoded in hexadecimal.\n"
-            "3. \"amount\"  (numeric, required) The amount in LBRYcrd to send. eg 0.1\n"
+            "1. \"name\"         (string, required) The name to be assigned the value.\n"
+            "2. \"value\"        (string, required) The value to assign to the name encoded in hexadecimal.\n"
+            "3. \"amount\"       (numeric, required) The amount in LBRYcrd to send. eg 0.1\n"
             "\nResult:\n"
             "\"transactionid\"  (string) The transaction id.\n");
     auto sName = request.params[0].get_str();
@@ -545,9 +545,13 @@ thoritative as long as it remains unspent and there are no other greater unspent
     if (!pwallet->GetKeyFromPool(newKey))
         throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
 
+    OutputType output_type = pwallet->m_default_address_type;
+    pwallet->LearnRelatedScripts(newKey, output_type);
+    CTxDestination dest = GetDestinationForKey(newKey, output_type);
+
     CCoinControl cc;
-    cc.m_change_type = DEFAULT_ADDRESS_TYPE;
-    auto tx = SendMoney(pwallet, CTxDestination(newKey.GetID()), nAmount, false, cc, {}, {}, claimScript);
+    cc.m_change_type = pwallet->m_default_change_type;
+    auto tx = SendMoney(pwallet, dest, nAmount, false, cc, {}, {}, claimScript);
     return tx->GetHash().GetHex();
 }
 
@@ -560,15 +564,15 @@ UniValue updateclaim(const JSONRPCRequest& request)
         return NullUniValue;
     }
 
-    if (request.fHelp || request.params.size() != 3)
+    if (request.fHelp || (request.params.size() != 3 && request.params.size() != 4))
         throw std::runtime_error(
             "updateclaim \"txid\" \"value\" amount\n"
             "Create a transaction which issues a claim assigning a value to a name, spending the previous txout which issued a claim over the same name and therefore superseding that claim. The claim will be authoritative if the transaction amount is greater than the transaction amount of all other unspent transactions which issue a claim over the same name, and it will remain authoritative as long as it remains unspent and there are no greater unspent transactions issuing a claim over the same name.\n"
             + HelpRequiringPassphrase(pwallet) + "\n"
             "Arguments:\n"
-            "1.  \"txid\"  (string, required) The transaction containing the unspent txout which should be spent.\n"
-            "2.  \"value\"  (string, required) The value to assign to the name encoded in hexadecimal.\n"
-            "3.  \"amount\"  (numeric, required) The amount in LBRYcrd to use to bid for the name. eg 0.1\n"
+            "1. \"txid\"         (string, required) The transaction containing the unspent txout which should be spent.\n"
+            "2. \"value\"        (string, required) The value to assign to the name encoded in hexadecimal.\n"
+            "3. \"amount\"       (numeric, required) The amount in LBRYcrd to use to bid for the name. eg 0.1\n"
             "\nResult:\n"
             "\"transactionid\"  (string) The new transaction id.\n");
 
@@ -621,11 +625,15 @@ UniValue updateclaim(const JSONRPCRequest& request)
                 if (!pwallet->GetKeyFromPool(newKey))
                     throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
 
+                OutputType output_type = pwallet->m_default_address_type;
+                pwallet->LearnRelatedScripts(newKey, output_type);
+                CTxDestination dest = GetDestinationForKey(newKey, output_type);
+
                 CCoinControl cc;
-                cc.m_change_type = DEFAULT_ADDRESS_TYPE;
+                cc.m_change_type = pwallet->m_default_change_type;
                 cc.Select(COutPoint(wtx.tx->GetHash(), i));
-                cc.fAllowOtherInputs = true; // the doc comment on this parameter says it should be false; experience says otherwise
-                wtxNew = SendMoney(pwallet, CTxDestination(newKey.GetID()), nAmount, false, cc, {}, {}, updateScript);
+                cc.fAllowOtherInputs = true; // when selecting a coin, that's the only one used without this flag (and we need to cover the fee)
+                wtxNew = SendMoney(pwallet, dest, nAmount, false, cc, {}, {}, updateScript);
                 break;
             }
         }
@@ -658,8 +666,7 @@ UniValue abandonclaim(const JSONRPCRequest& request)
     uint256 hash;
     hash.SetHex(request.params[0].get_str());
 
-    CKeyID address;
-    address.SetHex(request.params[1].get_str());
+    CTxDestination address = DecodeDestination(request.params[1].get_str());
 
     pwallet->BlockUntilSyncedToCurrentChain();
     LOCK2(cs_main, pwallet->cs_wallet);
@@ -677,7 +684,7 @@ UniValue abandonclaim(const JSONRPCRequest& request)
         {
             EnsureWalletIsUnlocked(pwallet);
             CCoinControl cc;
-            cc.m_change_type = DEFAULT_ADDRESS_TYPE;
+            cc.m_change_type = pwallet->m_default_change_type;
             cc.Select(COutPoint(wtx.tx->GetHash(), i));
             wtxNew = SendMoney(pwallet, address, wtx.tx->vout[i].nValue, true, cc, {}, {});
             break;
@@ -700,92 +707,93 @@ void ListNameClaims(const CWalletTx& wtx, CWallet* const pwallet, const std::str
     std::list<COutputEntry> listSent;
     std::list<COutputEntry> listReceived;
 
-    isminefilter filter = isminetype::ISMINE_CLAIM;
-    if (include_supports)
-        filter |= isminetype::ISMINE_SUPPORT;
-    wtx.GetAmounts(listReceived, listSent, nFee, strSentAccount, filter);
+    wtx.GetAmounts(listReceived, listSent, nFee, strSentAccount, isminetype::ISMINE_ALL);
 
     bool fAllAccounts = (strAccount == std::string("*"));
+    if (!fAllAccounts && wtx.strFromAccount != strAccount)
+        return;
 
-    if ((!listSent.empty() || nFee != 0) && (fAllAccounts || strAccount == strSentAccount))
+    for (const auto& s: listSent)
     {
-        for (const COutputEntry& s: listSent)
-        {
-            if (!list_spent && pwallet->IsSpent(wtx.GetHash(), s.vout))
-                continue;
+        if (!list_spent && pwallet->IsSpent(wtx.GetHash(), s.vout))
+            continue;
 
-            UniValue entry(UniValue::VOBJ);
-            const CScript& scriptPubKey = wtx.tx->vout[s.vout].scriptPubKey;
-            int op;
-            std::vector<std::vector<unsigned char>> vvchParams;
-            if (!DecodeClaimScript(scriptPubKey, op, vvchParams)) {
-                continue;
-            }
-            std::string sName (vvchParams[0].begin(), vvchParams[0].end());
-            entry.pushKV("name", escapeNonUtf8(sName));
-            if (op == OP_CLAIM_NAME)
-            {
-                uint160 claimId = ClaimIdHash(wtx.GetHash(), s.vout);
-                entry.pushKV("claimtype", "CLAIM");
-                entry.pushKV("claimId", claimId.GetHex());
-                entry.pushKV("value", HexStr(vvchParams[1].begin(), vvchParams[1].end()));
-            }
-            else if (op == OP_UPDATE_CLAIM)
-            {
-                uint160 claimId(vvchParams[1]);
-                entry.pushKV("claimtype", "CLAIM");
-                entry.pushKV("claimId", claimId.GetHex());
+        UniValue entry(UniValue::VOBJ);
+        const CScript& scriptPubKey = wtx.tx->vout[s.vout].scriptPubKey;
+        int op;
+        std::vector<std::vector<unsigned char>> vvchParams;
+        if (!DecodeClaimScript(scriptPubKey, op, vvchParams)) {
+            continue;
+        }
+        if (!include_supports && op == OP_SUPPORT_CLAIM)
+            continue;
+
+        std::string sName (vvchParams[0].begin(), vvchParams[0].end());
+        entry.pushKV("name", escapeNonUtf8(sName));
+        if (op == OP_CLAIM_NAME)
+        {
+            uint160 claimId = ClaimIdHash(wtx.GetHash(), s.vout);
+            entry.pushKV("claimtype", "CLAIM");
+            entry.pushKV("claimId", claimId.GetHex());
+            entry.pushKV("value", HexStr(vvchParams[1].begin(), vvchParams[1].end()));
+        }
+        else if (op == OP_UPDATE_CLAIM)
+        {
+            uint160 claimId(vvchParams[1]);
+            entry.pushKV("claimtype", "CLAIM");
+            entry.pushKV("claimId", claimId.GetHex());
+            entry.pushKV("value", HexStr(vvchParams[2].begin(), vvchParams[2].end()));
+        }
+        else if (op == OP_SUPPORT_CLAIM)
+        {
+            uint160 claimId(vvchParams[1]);
+            entry.pushKV("claimtype", "SUPPORT");
+            entry.pushKV("supported_claimid", claimId.GetHex());
+            if (vvchParams.size() > 2) {
                 entry.pushKV("value", HexStr(vvchParams[2].begin(), vvchParams[2].end()));
             }
-            else if (op == OP_SUPPORT_CLAIM)
-            {
-                uint160 claimId(vvchParams[1]);
-                entry.pushKV("claimtype", "SUPPORT");
-                entry.pushKV("supported_claimid", claimId.GetHex());
-                if (vvchParams.size() > 2) {
-                    entry.pushKV("value", HexStr(vvchParams[2].begin(), vvchParams[2].end()));
-                }
-            }
-            entry.pushKV("txid", wtx.GetHash().ToString());
-            entry.pushKV("account", strSentAccount);
-            MaybePushAddress(entry, s.destination);
-            entry.pushKV("amount", ValueFromAmount(s.amount));
-            entry.pushKV("vout", s.vout);
-            entry.pushKV("fee", ValueFromAmount(nFee));
-
-            CClaimTrieCache trieCache(pclaimTrie);
-
-            auto it = mapBlockIndex.find(wtx.hashBlock);
-            if (it != mapBlockIndex.end())
-            {
-                CBlockIndex* pindex = it->second;
-                if (pindex)
-                {
-                    entry.pushKV("height", pindex->nHeight);
-                    entry.pushKV("expiration height", pindex->nHeight + trieCache.expirationTime());
-                    if (pindex->nHeight + trieCache.expirationTime() > chainActive.Height())
-                    {
-                        entry.pushKV("expired", false);
-                        entry.pushKV("blocks to expiration", pindex->nHeight + trieCache.expirationTime() - chainActive.Height());
-                    }
-                    else
-                    {
-                        entry.pushKV("expired", true);
-                    }
-                }
-            }
-            entry.pushKV("confirmations", wtx.GetDepthInMainChain());
-            entry.pushKV("is spent", pwallet->IsSpent(wtx.GetHash(), s.vout));
-            if (op == OP_CLAIM_NAME)
-            {
-                entry.pushKV("is in name trie", trieCache.haveClaim(sName, COutPoint(wtx.GetHash(), s.vout)));
-            }
-            else if (op == OP_SUPPORT_CLAIM)
-            {
-                entry.pushKV("is in support map", trieCache.haveSupport(sName, COutPoint(wtx.GetHash(), s.vout)));
-            }
-            ret.push_back(entry);
         }
+        else
+            throw JSONRPCError(RPC_INTERNAL_ERROR, "Undefined claim operator.");
+        entry.pushKV("txid", wtx.GetHash().ToString());
+        entry.pushKV("account", strSentAccount);
+        MaybePushAddress(entry, s.destination);
+        entry.pushKV("amount", ValueFromAmount(s.amount));
+        entry.pushKV("vout", s.vout);
+        entry.pushKV("fee", ValueFromAmount(nFee));
+
+        CClaimTrieCache trieCache(pclaimTrie);
+
+        auto it = mapBlockIndex.find(wtx.hashBlock);
+        if (it != mapBlockIndex.end())
+        {
+            CBlockIndex* pindex = it->second;
+            if (pindex)
+            {
+                entry.pushKV("height", pindex->nHeight);
+                entry.pushKV("expiration height", pindex->nHeight + trieCache.expirationTime());
+                if (pindex->nHeight + trieCache.expirationTime() > chainActive.Height())
+                {
+                    entry.pushKV("expired", false);
+                    entry.pushKV("blocks to expiration", pindex->nHeight + trieCache.expirationTime() - chainActive.Height());
+                }
+                else
+                {
+                    entry.pushKV("expired", true);
+                }
+            }
+        }
+        entry.pushKV("confirmations", wtx.GetDepthInMainChain());
+        entry.pushKV("is spent", pwallet->IsSpent(wtx.GetHash(), s.vout));
+        if (op == OP_CLAIM_NAME)
+        {
+            entry.pushKV("is in name trie", trieCache.haveClaim(sName, COutPoint(wtx.GetHash(), s.vout)));
+        }
+        else if (op == OP_SUPPORT_CLAIM)
+        {
+            entry.pushKV("is in support map", trieCache.haveSupport(sName, COutPoint(wtx.GetHash(), s.vout)));
+        }
+        ret.push_back(entry);
     }
 }
 
@@ -804,8 +812,7 @@ UniValue listnameclaims(const JSONRPCRequest& request)
             "Return a list of all transactions claiming names.\n"
             "\nArguments\n"
             "1. includesupports  (bool, optional) Whether to also include claim supports. Default is true.\n"
-            "2. activeonly       (bool, optional, not implemented) Whether to only include transactions which are still active, i.e. have n\
-ot been spent. Default is false.\n"
+            "2. activeonly       (bool, optional) Whether to only include transactions which are still active, i.e. have not been spent. Default is true.\n"
             "3. minconf          (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
             "\nResult:\n"
             "[\n"
@@ -835,7 +842,7 @@ ot been spent. Default is false.\n"
     std::string strAccount = "*";
 
     auto include_supports = request.params.size() < 1 || request.params[0].get_bool();
-    bool fListSpent = request.params.size() > 1 && request.params[1].get_bool();
+    bool fListSpent = request.params.size() > 1 && !request.params[1].get_bool();
 
     // Minimum confirmations
     int nMinDepth = 1;
@@ -873,7 +880,7 @@ UniValue supportclaim(const JSONRPCRequest& request)
         return NullUniValue;
     }
 
-    if (request.fHelp || (request.params.size() != 3 && request.params.size() != 4))
+    if (request.fHelp || request.params.size() < 3 || request.params.size() > 5)
         throw std::runtime_error(
             "supportclaim \"name\" \"claimid\" \"amount\" \"value\"\n"
             "Increase the value of a claim. Whichever claim has the greatest value, including all support values, will be the authoritative claim, according to the rest of the rules. The name is the name which is claimed by the claim that will be supported, the txid is the txid\
@@ -881,10 +888,10 @@ UniValue supportclaim(const JSONRPCRequest& request)
 . Otherwise, it will go into effect after 100 blocks. The support will be in effect until it is spent, and will lose its effect when the claim is spent or expires. The amount is a real and is rounded to the nearest .00000001\n"
             + HelpRequiringPassphrase(pwallet) +
             "\nArguments:\n"
-            "1. \"name\"  (string, required) The name claimed by the claim to support.\n"
-            "2. \"claimid\"  (string, required) The claimid of the claim to support. This can be obtained by TODO PUT IN PLACE THAT SHOWS THIS.\n"
-            "3. \"amount\"  (numeric, required) The amount in LBC to use to support the claim.\n"
-            "4. \"value\"  (string, optional) The metadata of the support encoded in hexadecimal.\n"
+            "1. \"name\"         (string, required) The name claimed by the claim to support.\n"
+            "2. \"claimid\"      (string, required) The claimid of the claim to support.\n"
+            "3. \"amount\"       (numeric, required) The amount in LBC to use to support the claim.\n"
+            "4. \"value\"        (string, optional) The metadata of the support encoded in hexadecimal.\n"
             "\nResult:\n"
             "\"transactionid\"  (string) The transaction id of the support.\n");
 
@@ -911,10 +918,14 @@ UniValue supportclaim(const JSONRPCRequest& request)
     auto lastOp = OP_DROP;
     if (request.params.size() > 3) {
         auto hex = request.params[3].get_str();
-        if (!IsHex(hex))
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "value/metadata must be of hexadecimal data");
-        supportScript = supportScript << ParseHex(hex);
-        lastOp = OP_2DROP;
+        if (!hex.empty()) {
+            if (!IsHex(hex))
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "value/metadata must be of hexadecimal data");
+            if (!IsWitnessEnabled(chainActive.Tip(), Params().GetConsensus()))
+                throw JSONRPCError(RPC_INVALID_PARAMETER, "value/metadata on supports is not enabled yet");
+            supportScript = supportScript << ParseHex(hex);
+            lastOp = OP_2DROP;
+        }
     }
 
     supportScript = supportScript << OP_2DROP << lastOp;
@@ -923,9 +934,13 @@ UniValue supportclaim(const JSONRPCRequest& request)
     if (!pwallet->GetKeyFromPool(newKey))
         throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");
 
+    OutputType output_type = pwallet->m_default_address_type;
+    pwallet->LearnRelatedScripts(newKey, output_type);
+    CTxDestination dest = GetDestinationForKey(newKey, output_type);
+
     CCoinControl cc;
-    cc.m_change_type = DEFAULT_ADDRESS_TYPE;
-    auto tx = SendMoney(pwallet, CTxDestination(newKey.GetID()), nAmount, false, cc, {}, {}, supportScript);
+    cc.m_change_type = pwallet->m_default_change_type;
+    auto tx = SendMoney(pwallet, dest, nAmount, false, cc, {}, {}, supportScript);
     return tx->GetHash().GetHex();
 }
 
@@ -952,8 +967,7 @@ UniValue abandonsupport(const JSONRPCRequest& request)
     uint256 hash;
     hash.SetHex(request.params[0].get_str());
 
-    CKeyID address;
-    address.SetHex(request.params[1].get_str());
+    CTxDestination address = DecodeDestination(request.params[1].get_str());
 
     pwallet->BlockUntilSyncedToCurrentChain();
     LOCK2(cs_main, pwallet->cs_wallet);
@@ -971,7 +985,7 @@ UniValue abandonsupport(const JSONRPCRequest& request)
         {
             EnsureWalletIsUnlocked(pwallet);
             CCoinControl cc;
-            cc.m_change_type = DEFAULT_ADDRESS_TYPE;
+            cc.m_change_type = pwallet->m_default_change_type;
             cc.Select(COutPoint(wtx.tx->GetHash(), i));
             wtxNew = SendMoney(pwallet, address, wtx.tx->vout[i].nValue, true, cc, {}, {});
             break;
@@ -4688,6 +4702,8 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
     isminetype mine = IsMine(*pwallet, dest);
     ret.pushKV("ismine", bool(mine & ISMINE_SPENDABLE));
     ret.pushKV("iswatchonly", bool(mine & ISMINE_WATCH_ONLY));
+    ret.pushKV("isclaim", bool(mine & ISMINE_CLAIM));
+    ret.pushKV("issupport", bool(mine & ISMINE_SUPPORT));
     UniValue detail = DescribeWalletAddress(pwallet, dest);
     ret.pushKVs(detail);
     if (pwallet->mapAddressBook.count(dest)) {
@@ -5311,11 +5327,11 @@ static const CRPCCommand commands[] =
 
     { "generating",         "generate",                         &generate,                      {"nblocks","maxtries"} },
 
-    { "Claimtrie",          "claimname",                        &claimname,                     {"name","value","amount"} },
-    { "Claimtrie",          "updateclaim",                      &updateclaim,                   {"txid","value","amount"} },
+    { "Claimtrie",          "claimname",                        &claimname,                     {"name","value","amount","address_type"} },
+    { "Claimtrie",          "updateclaim",                      &updateclaim,                   {"txid","value","amount","address_type"} },
     { "Claimtrie",          "abandonclaim",                     &abandonclaim,                  {"txid","address"} },
     { "Claimtrie",          "listnameclaims",                   &listnameclaims,                {"includesuppports","activeonly","minconf"} },
-    { "Claimtrie",          "supportclaim",                     &supportclaim,                  {"name","claimid","amount","value"} },
+    { "Claimtrie",          "supportclaim",                     &supportclaim,                  {"name","claimid","amount","value","address_type"} },
     { "Claimtrie",          "abandonsupport",                   &abandonsupport,                {"txid","address"} },
 };
 
diff --git a/src/wallet/test/claim_rpc_tests.cpp b/src/wallet/test/claim_rpc_tests.cpp
index 46fc8bc39..be29f3da9 100644
--- a/src/wallet/test/claim_rpc_tests.cpp
+++ b/src/wallet/test/claim_rpc_tests.cpp
@@ -149,11 +149,9 @@ uint256 AbandonAClaim(const uint256& txid, bool isSupport = false) {
     }
 }
 
-BOOST_AUTO_TEST_CASE(claim_op_runthrough)
-{
-    generateBlock(105);
-
-    BOOST_CHECK_GE(AvailableBalance(), 2.0);
+void AddClaimSupportThenRemove() {
+    generateBlock(155);
+    BOOST_CHECK_EQUAL(AvailableBalance(), 55.0);
 
     // ops for test: claimname, updateclaim, abandonclaim, listnameclaims, supportclaim, abandonsupport
     // order of ops:
@@ -171,7 +169,7 @@ BOOST_AUTO_TEST_CASE(claim_op_runthrough)
     BOOST_CHECK_EQUAL(looked[0]["value"].get_str(), "deadbeef");
     BOOST_CHECK_EQUAL(looked[0]["txid"].get_str(), txid.GetHex());
 
-    // udpate it
+    // update it
     auto txid2 = ClaimAName(txid.GetHex(), "deadbeef02", "1.0", true);
     auto g2 = generateBlock();
     looked = LookupAllNames().get_array();
@@ -252,4 +250,29 @@ BOOST_AUTO_TEST_CASE(claim_op_runthrough)
     */
 }
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_CASE(claim_op_runthrough_legacy)
+{
+    for (auto& wallet: GetWallets())
+        wallet->m_default_address_type = OutputType::LEGACY;
+    AddClaimSupportThenRemove();
+}
+
+BOOST_AUTO_TEST_CASE(claim_op_runthrough_p2sh)
+{
+    for (auto& wallet: GetWallets()) {
+        BOOST_CHECK(DEFAULT_ADDRESS_TYPE == wallet->m_default_address_type); // BOOST_CHECK_EQUAL no compile here
+        wallet->m_default_address_type = OutputType::P2SH_SEGWIT;
+    }
+    AddClaimSupportThenRemove();
+}
+
+BOOST_AUTO_TEST_CASE(claim_op_runthrough_bech32)
+{
+    for (auto& wallet: GetWallets()) {
+        BOOST_CHECK(DEFAULT_ADDRESS_TYPE == wallet->m_default_address_type); // BOOST_CHECK_EQUAL no compile here
+        wallet->m_default_address_type = OutputType::BECH32;
+    }
+    AddClaimSupportThenRemove();
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index ec9dc87ad..780e266c4 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1401,16 +1401,15 @@ bool CWallet::IsChange(const CTxOut& txout) const
     // a better way of identifying which outputs are 'the send' and which are
     // 'the change' will need to be implemented (maybe extend CWalletTx to remember
     // which output, if any, was change).
-    if (::IsMine(*this, txout.scriptPubKey))
+    auto isMine = ::IsMine(*this, txout.scriptPubKey);
+    if (isMine && !(isMine & ISMINE_STAKE)) // stakes are never change
     {
         CTxDestination address;
-        const CScript& scriptPubKey = StripClaimScriptPrefix(txout.scriptPubKey);
-
-        if (!ExtractDestination(scriptPubKey, address))
+        if (!ExtractDestination(txout.scriptPubKey, address))
             return true;
 
         LOCK(cs_wallet);
-        if (!mapAddressBook.count(address) && (scriptPubKey == txout.scriptPubKey))
+        if (!mapAddressBook.count(address))
             return true;
     }
     return false;
@@ -1697,7 +1696,7 @@ void CWalletTx::GetAmounts(std::list<COutputEntry>& listReceived,
 
         if (!ExtractDestination(scriptPubKey, address) && !scriptPubKey.IsUnspendable())
         {
-            LogPrintf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s\n",
+            pwallet->WalletLogPrintf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s\n",
                      this->GetHash().ToString());
             address = CNoDestination();
         }
@@ -1705,7 +1704,7 @@ void CWalletTx::GetAmounts(std::list<COutputEntry>& listReceived,
         COutputEntry output = {address, txout.nValue, (int)i};
 
         // If we are debited by the transaction, add the output as a "sent" entry
-        if (nDebit > 0 || filter & ISMINE_CLAIM || filter & ISMINE_SUPPORT)
+        if (nDebit > 0)
             listSent.push_back(output);
 
         // If we are receiving the output, add it as a "received" entry
@@ -2081,7 +2080,7 @@ bool CWalletTx::IsTrusted() const
         if (parent == nullptr)
             return false;
         const CTxOut& parentOut = parent->tx->vout[txin.prevout.n];
-        if (pwallet->IsMine(parentOut) != ISMINE_SPENDABLE)
+        if (!(pwallet->IsMine(parentOut) & ISMINE_SPENDABLE))
             return false;
     }
     return true;
@@ -2375,15 +2374,15 @@ void CWallet::AvailableCoins(std::vector<COutput> &vCoins, bool fOnlySafe, const
                 continue;
             }
 
+            bool solvable = IsSolvable(*this, pcoin->tx->vout[i].scriptPubKey);
+            bool spendable = (mine & ISMINE_SPENDABLE) || (((mine & ISMINE_WATCH_ONLY) != ISMINE_NO) && (coinControl && coinControl->fAllowWatchOnly && solvable));
+
             // spending claims or supports requires specific selection:
             auto isClaimCoin = (mine & ISMINE_CLAIM) || (mine & ISMINE_SUPPORT);
             auto claimSpendRequested = isClaimCoin && coinControl && coinControl->IsSelected(COutPoint(entry.first, i));
 
-            bool solvable = IsSolvable(*this, pcoin->tx->vout[i].scriptPubKey);
-            bool spendable = claimSpendRequested || ((mine & ISMINE_SPENDABLE) != ISMINE_NO) || (((mine & ISMINE_WATCH_ONLY) != ISMINE_NO) && (coinControl && coinControl->fAllowWatchOnly && solvable));
-
             if (spendable && isClaimCoin && !claimSpendRequested)
-                continue; // double check
+                continue;
 
             vCoins.push_back(COutput(pcoin, i, nDepth, spendable, solvable, safeTx, (coinControl && coinControl->fAllowWatchOnly)));
 
@@ -2437,7 +2436,7 @@ std::map<CTxDestination, std::vector<COutput>> CWallet::ListCoins() const
         if (it != mapWallet.end()) {
             int depth = it->second.GetDepthInMainChain();
             if (depth >= 0 && output.n < it->second.tx->vout.size() &&
-                IsMine(it->second.tx->vout[output.n]) == ISMINE_SPENDABLE) {
+                IsMine(it->second.tx->vout[output.n]) & ISMINE_SPENDABLE) {
                 CTxDestination address;
                 if (ExtractDestination(FindNonChangeParentOutput(*it->second.tx, output.n).scriptPubKey, address)) {
                     result[address].emplace_back(
@@ -2704,7 +2703,8 @@ OutputType CWallet::TransactionChangeType(OutputType change_type, const std::vec
         // Check if any destination contains a witness program:
         int witnessversion = 0;
         std::vector<unsigned char> witnessprogram;
-        if (recipient.scriptPubKey.IsWitnessProgram(witnessversion, witnessprogram)) {
+        const auto stripped = StripClaimScriptPrefix(recipient.scriptPubKey);
+        if (stripped.IsWitnessProgram(witnessversion, witnessprogram)) {
             return OutputType::BECH32;
         }
     }
diff --git a/test/util/data/txcreatemultisig3.json b/test/util/data/txcreatemultisig3.json
index b355d7b19..dc3e1289b 100644
--- a/test/util/data/txcreatemultisig3.json
+++ b/test/util/data/txcreatemultisig3.json
@@ -18,7 +18,7 @@
                 "reqSigs": 1,
                 "type": "witness_v0_scripthash",
                 "addresses": [
-                    "bc1qu9dgdg330r6r84g5mw7wqshg04exv2uttmw2elfwx74h5tgntuzs44gyfg"
+                    "lbc1qu9dgdg330r6r84g5mw7wqshg04exv2uttmw2elfwx74h5tgntuzsq9wzaf"
                 ]
             }
         }
diff --git a/test/util/data/txcreateoutpubkey2.json b/test/util/data/txcreateoutpubkey2.json
index c0ee181ed..0ecd2b2aa 100644
--- a/test/util/data/txcreateoutpubkey2.json
+++ b/test/util/data/txcreateoutpubkey2.json
@@ -18,7 +18,7 @@
                 "reqSigs": 1,
                 "type": "witness_v0_keyhash",
                 "addresses": [
-                    "bc1q5fgkuac9s2ry56jka5s6zqsyfcugcchry5cwu0"
+                    "lbc1q5fgkuac9s2ry56jka5s6zqsyfcugcchry7rwyw"
                 ]
             }
         }
diff --git a/test/util/data/txcreatescript3.json b/test/util/data/txcreatescript3.json
index b9192d9a8..2d2590a27 100644
--- a/test/util/data/txcreatescript3.json
+++ b/test/util/data/txcreatescript3.json
@@ -18,7 +18,7 @@
                 "reqSigs": 1,
                 "type": "witness_v0_scripthash",
                 "addresses": [
-                    "bc1qp0lfxhnscvsu0j36l36uurgv5tuck4pzuqytkvwqp3kh78cupttqyf705v"
+                    "lbc1qp0lfxhnscvsu0j36l36uurgv5tuck4pzuqytkvwqp3kh78cupttq3ecfqd"
                 ]
             }
         }