diff --git a/src/init.cpp b/src/init.cpp
index 5e63df2639be..9af54ea6a93f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -2430,7 +2430,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
                 LogPrintf("Verifying and repairing masternode list diffs...\n");
                 const auto start{SteadyClock::now()};
                 // Create a callback that wraps CSpecialTxProcessor::BuildNewListFromBlock
-                auto build_list_func = [&node](const CBlock& block, gsl::not_null<const CBlockIndex*> pindexPrev,
+                auto build_list_func = [&node](const CBlock& block, const CBlockIndex* const pindexPrev,
                                                        const CDeterministicMNList& prevList, const CCoinsViewCache& view,
                                                        bool debugLogs, BlockValidationState& state,
                                                        CDeterministicMNList& mnListRet) -> bool {
diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp
index 44c6f4fda664..deee9ffe8a78 100644
--- a/src/rpc/evo.cpp
+++ b/src/rpc/evo.cpp
@@ -1801,7 +1801,7 @@ static UniValue evodb_verify_or_repair_impl(const JSONRPCRequest& request, bool
     }
 
     // Create a callback that wraps CSpecialTxProcessor::RebuildListFromBlock
-    auto build_list_func = [&chain_helper](const CBlock& block, gsl::not_null<const CBlockIndex*> pindexPrev,
+    auto build_list_func = [&chain_helper](const CBlock& block, const CBlockIndex* const pindexPrev,
                                            const CDeterministicMNList& prevList, const CCoinsViewCache& view,
                                            bool debugLogs, BlockValidationState& state,
                                            CDeterministicMNList& mnListRet) -> bool {