diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index 0729c99f6d..2ad9a2a6e3 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -331,7 +331,7 @@ public:
 
 CScript GetScriptForDestination(const CTxDestination& dest)
 {
-    return boost::apply_visitor(CScriptVisitor{}, dest);
+    return boost::apply_visitor(CScriptVisitor(), dest);
 }
 
 CScript GetScriptForRawPubKey(const CPubKey& pubKey)
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index dedf53cf70..b1c85f6056 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -247,7 +247,7 @@ static void SetFeeEstimateMode(const CWallet* pwallet, CCoinControl& cc, const U
         cc.m_feerate = CFeeRate(fee_rate);
 
         // default RBF to true for explicit fee rate modes
-        if (cc.m_signal_bip125_rbf == boost::none) cc.m_signal_bip125_rbf = true;
+        if (cc.m_signal_bip125_rbf == nullopt) cc.m_signal_bip125_rbf = true;
     } else if (!estimate_param.isNull()) {
         cc.m_confirm_target = ParseConfirmTarget(estimate_param, pwallet->chain().estimateMaxBlocks());
     }