diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index f18ee1cd59..3455c2c180 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -3113,7 +3113,7 @@ void FundTransaction(CWallet* const pwallet, CMutableTransaction& tx, CAmount& f
                 std::map<std::string, UniValue> kvMap;
                 options["changeAddress"].getObjMap(kvMap);
 
-                for (const std::pair<std::string, UniValue>& kv : kvMap) {
+                for (const auto& kv : kvMap) {
                     CAsset asset = GetAssetFromString(kv.first);
                     if (asset.IsNull()) {
                         throw JSONRPCError(RPC_INVALID_PARAMETER, "changeAddress key must be a valid asset label or hex");
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 8eb09ba708..f5531a9eb2 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -2932,7 +2932,7 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CTransac
 
             mapScriptChange.clear();
             if (coin_control.destChange.size() > 0) {
-                for (const std::pair<CAsset, CTxDestination>& dest : coin_control.destChange) {
+                for (const auto& dest : coin_control.destChange) {
                     // No need to test we cover all assets.  We produce error for that later.
                     mapScriptChange[dest.first] = std::pair<int, CScript>(-1, GetScriptForDestination(dest.second));
                 }
@@ -3463,7 +3463,7 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CTransac
         }
 
         // Release any change keys that we didn't use.
-        for (const std::pair<CAsset, std::pair<int, CScript>>& it : mapScriptChange) {
+        for (const auto& it : mapScriptChange) {
             int index = it.second.first;
             if (index < 0) {
                 continue;