diff --git a/src/interfaces/node.h b/src/interfaces/node.h
index 3a4d59d55b29..b6fbef3de525 100644
--- a/src/interfaces/node.h
+++ b/src/interfaces/node.h
@@ -146,6 +146,7 @@ class GOV
         int nextsuperblock{0};
         int fundingthreshold{0};
         CAmount governancebudget{0};
+        int64_t targetSpacing{0};
         int relayRequiredConfs{1};
         int requiredConfs{6};
     };
diff --git a/src/interfaces/wallet.h b/src/interfaces/wallet.h
index 8c79ec01ca98..11e1cda99978 100644
--- a/src/interfaces/wallet.h
+++ b/src/interfaces/wallet.h
@@ -27,6 +27,7 @@
 #include <vector>
 
 class CFeeRate;
+class CGovernanceVote;
 class CKey;
 class CRPCCommand;
 enum class FeeReason;
@@ -355,6 +356,9 @@ class Wallet
                                  const std::string& data_hex, const COutPoint& outpoint,
                                  std::string& out_fee_txid, std::string& error) = 0;
 
+    //! Sign a governance vote with the given voting key.
+    virtual bool signGovernanceVote(const CKeyID& keyID, CGovernanceVote& vote) = 0;
+
     //! Return pointer to internal wallet class, useful for testing.
     virtual wallet::CWallet* wallet() { return nullptr; }
 };
diff --git a/src/net.cpp b/src/net.cpp
index 4467507f68e0..3b70ee45fe00 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -4200,6 +4200,7 @@ void CConnman::StopNodes()
     }
     m_nodes_disconnected.clear();
     vhListenSocket.clear();
+    WITH_LOCK(m_reconnections_mutex, m_reconnections.clear());
     semOutbound.reset();
     semAddnode.reset();
     /**
diff --git a/src/net.h b/src/net.h
index 6a742647ac0b..8bdda43e9e75 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1261,8 +1261,8 @@ friend class CNode;
         EXCLUSIVE_LOCKS_REQUIRED(!m_total_bytes_sent_mutex, !m_added_nodes_mutex, !m_addr_fetches_mutex, !mutexMsgProc);
 
     void StopThreads();
-    void StopNodes() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !cs_mapSocketToNode, !cs_sendable_receivable_nodes);
-    void Stop() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !cs_mapSocketToNode, !cs_sendable_receivable_nodes)
+    void StopNodes() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !cs_mapSocketToNode, !cs_sendable_receivable_nodes, !m_reconnections_mutex);
+    void Stop() EXCLUSIVE_LOCKS_REQUIRED(!m_nodes_mutex, !cs_mapSocketToNode, !cs_sendable_receivable_nodes, !m_reconnections_mutex)
     {
         StopThreads();
         StopNodes();
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index 1213e1380666..018739f399da 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -282,6 +282,7 @@ class GOVImpl : public GOV
         info.proposalfee = GOVERNANCE_PROPOSAL_FEE_TX;
         info.superblockcycle = consensusParams.nSuperblockCycle;
         info.superblockmaturitywindow = consensusParams.nSuperblockMaturityWindow;
+        info.targetSpacing = consensusParams.nPowTargetSpacing;
         info.relayRequiredConfs = GOVERNANCE_MIN_RELAY_FEE_CONFIRMATIONS;
         info.requiredConfs = GOVERNANCE_FEE_CONFIRMATIONS;
         if (ctx.dmnman) {
@@ -366,7 +367,7 @@ class LLMQImpl : public LLMQ
 public:
     size_t getInstantSentLockCount() override
     {
-        if (context().llmq_ctx->isman != nullptr) {
+        if (context().llmq_ctx && context().llmq_ctx->isman != nullptr) {
             return context().llmq_ctx->isman->GetInstantSendLockCount();
         }
         return 0;
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index b1acc667ba32..dc5055a089c5 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -1476,7 +1476,14 @@ void BitcoinGUI::updateGovernanceVisibility()
     // Show/hide the underlying QAction, hiding the QToolButton itself doesn't
     // work for the GUI part but is still needed for shortcuts to work properly.
     if (m_governance_action) m_governance_action->setVisible(fShow);
-    if (governanceButton) governanceButton->setVisible(fShow);
+    if (governanceButton) {
+#ifdef ENABLE_WALLET
+        if (!fShow && governanceButton->isChecked()) {
+            gotoOverviewPage();
+        }
+#endif // ENABLE_WALLET
+        governanceButton->setVisible(fShow);
+    }
 
     GUIUtil::updateButtonGroupShortcuts(tabGroup);
     updateWidth();
@@ -1490,7 +1497,14 @@ void BitcoinGUI::updateMasternodesVisibility()
     // Show/hide the underlying QAction, hiding the QToolButton itself doesn't
     // work for the GUI part but is still needed for shortcuts to work properly.
     if (m_masternode_action) m_masternode_action->setVisible(fShow);
-    if (masternodeButton) masternodeButton->setVisible(fShow);
+    if (masternodeButton) {
+#ifdef ENABLE_WALLET
+        if (!fShow && masternodeButton->isChecked()) {
+            gotoOverviewPage();
+        }
+#endif // ENABLE_WALLET
+        masternodeButton->setVisible(fShow);
+    }
 
     GUIUtil::updateButtonGroupShortcuts(tabGroup);
     updateWidth();
@@ -1507,7 +1521,7 @@ void BitcoinGUI::updateWidth()
     int nWidthWidestButton{0};
     int nButtonsVisible{0};
     for (QAbstractButton* button : tabGroup->buttons()) {
-        if (!button->isEnabled()) {
+        if (!button->isEnabled() || !button->isVisible()) {
             continue;
         }
         QFontMetrics fm(button->font());
diff --git a/src/qt/governancelist.cpp b/src/qt/governancelist.cpp
index f7b64ba1b2ee..ae560bc8ca32 100644
--- a/src/qt/governancelist.cpp
+++ b/src/qt/governancelist.cpp
@@ -18,7 +18,6 @@
 #include <interfaces/wallet.h>
 #include <script/standard.h>
 #include <util/strencodings.h>
-#include <wallet/wallet.h>
 
 #include <qt/clientmodel.h>
 #include <qt/guiutil.h>
@@ -156,7 +155,7 @@ void GovernanceList::showCreateProposalDialog()
         QMessageBox::warning(this, tr("Unavailable"), tr("A synced node and an unlocked wallet are required."));
         return;
     }
-    ProposalWizard* proposalWizard = new ProposalWizard(this->clientModel->node(), this->walletModel, this);
+    ProposalWizard* proposalWizard = new ProposalWizard(this->walletModel, this);
     // Ensure closing the dialog actually destroys it so a fresh flow starts next time
     proposalWizard->setAttribute(Qt::WA_DeleteOnClose, true);
     // Modeless window that does not block the parent
@@ -304,8 +303,8 @@ void GovernanceList::voteForProposal(vote_outcome_enum_t outcome)
         // Create vote
         CGovernanceVote vote(dmn->getCollateralOutpoint(), proposalHash, VOTE_SIGNAL_FUNDING, outcome);
 
-        // Sign vote using CWallet member function
-        if (!walletModel->wallet().wallet()->SignGovernanceVote(votingKeyID, vote)) {
+        // Sign vote via wallet interface
+        if (!walletModel->wallet().signGovernanceVote(votingKeyID, vote)) {
             nFailed++;
             failedMessages.append(
                 tr("Failed to sign vote for masternode %1").arg(QString::fromStdString(proTxHash.ToString())));
diff --git a/src/qt/masternodelist.cpp b/src/qt/masternodelist.cpp
index ec293e8ce526..700fdabc6782 100644
--- a/src/qt/masternodelist.cpp
+++ b/src/qt/masternodelist.cpp
@@ -20,6 +20,8 @@
 #include <QClipboard>
 #include <QHeaderView>
 
+#include <set>
+
 namespace {
 constexpr int MASTERNODELIST_UPDATE_SECONDS{3};
 } // anonymous namespace
@@ -60,7 +62,7 @@ bool MasternodeListSortFilterProxyModel::filterAcceptsRow(int source_row, const
     if (m_show_owned_only) {
         QModelIndex idx = sourceModel()->index(source_row, MasternodeModel::PROTX_HASH, source_parent);
         QString proTxHash = sourceModel()->data(idx, Qt::DisplayRole).toString();
-        if (m_my_mn_hashes.find(proTxHash) == m_my_mn_hashes.end()) {
+        if (!m_my_mn_hashes.contains(proTxHash)) {
             return false;
         }
     }
@@ -186,26 +188,27 @@ void MasternodeList::updateDIP3ListScheduled()
         int64_t nSecondsToWait = nTimeUpdatedDIP3 - GetTime() + nMnListUpdateSecods;
 
         if (nSecondsToWait <= 0) {
-            updateDIP3List();
-            m_mn_list_changed.store(false, std::memory_order_relaxed);
+            if (updateDIP3List()) {
+                m_mn_list_changed.store(false, std::memory_order_relaxed);
+            }
         }
     }
 }
 
-void MasternodeList::updateDIP3List()
+bool MasternodeList::updateDIP3List()
 {
     if (!clientModel || clientModel->node().shutdownRequested()) {
-        return;
+        return false;
     }
 
     auto [mnList, pindex] = clientModel->getMasternodeList();
-    if (!pindex) return;
+    if (!pindex) return false;
     auto projectedPayees = mnList->getProjectedMNPayees(pindex);
 
     if (projectedPayees.empty() && mnList->getValidMNsCount() > 0) {
         // GetProjectedMNPayees failed to provide results for a list with valid mns.
         // Keep current list and let it try again later.
-        return;
+        return false;
     }
 
     std::map<uint256, CTxDestination> mapCollateralDests;
@@ -260,6 +263,7 @@ void MasternodeList::updateDIP3List()
     }
 
     updateFilteredCount();
+    return true;
 }
 
 void MasternodeList::updateMyMasternodeHashes(const interfaces::MnListPtr& mnList)
@@ -273,7 +277,7 @@ void MasternodeList::updateMyMasternodeHashes(const interfaces::MnListPtr& mnLis
         setOutpts.emplace(outpt);
     }
 
-    std::set<QString> myHashes;
+    QSet<QString> myHashes;
     mnList->forEachMN(/*only_valid=*/false, [&](const auto& dmn) {
         bool fMyMasternode = setOutpts.count(dmn.getCollateralOutpoint()) ||
                              walletModel->wallet().isSpendable(PKHash(dmn.getKeyIdOwner())) ||
diff --git a/src/qt/masternodelist.h b/src/qt/masternodelist.h
index 56929aeaf38b..2a940c14538a 100644
--- a/src/qt/masternodelist.h
+++ b/src/qt/masternodelist.h
@@ -8,6 +8,7 @@
 #include <util/system.h>
 
 #include <QMenu>
+#include <QSet>
 #include <QSortFilterProxyModel>
 #include <QString>
 #include <QTimer>
@@ -15,7 +16,6 @@
 
 #include <atomic>
 #include <memory>
-#include <set>
 
 namespace interfaces {
 class MnList;
@@ -51,7 +51,7 @@ class MasternodeListSortFilterProxyModel : public QSortFilterProxyModel
 
     void forceInvalidateFilter() { invalidateFilter(); }
     void setHideBanned(bool hide) { m_hide_banned = hide; }
-    void setMyMasternodeHashes(std::set<QString> hashes) { m_my_mn_hashes = std::move(hashes); }
+    void setMyMasternodeHashes(QSet<QString> hashes) { m_my_mn_hashes = std::move(hashes); }
     void setShowOwnedOnly(bool show) { m_show_owned_only = show; }
     void setTypeFilter(TypeFilter type) { m_type_filter = type; }
 
@@ -61,7 +61,7 @@ class MasternodeListSortFilterProxyModel : public QSortFilterProxyModel
 private:
     bool m_hide_banned{true};
     bool m_show_owned_only{false};
-    std::set<QString> m_my_mn_hashes;
+    QSet<QString> m_my_mn_hashes;
     TypeFilter m_type_filter{TypeFilter::All};
 };
 
@@ -96,7 +96,7 @@ class MasternodeList : public QWidget
 
     const MasternodeEntry* GetSelectedEntry();
 
-    void updateDIP3List();
+    bool updateDIP3List();
     void updateMyMasternodeHashes(const interfaces::MnListPtr& mnList);
 
 Q_SIGNALS:
diff --git a/src/qt/masternodemodel.cpp b/src/qt/masternodemodel.cpp
index bd2e6ebdb9c9..5eb0d0da1e7c 100644
--- a/src/qt/masternodemodel.cpp
+++ b/src/qt/masternodemodel.cpp
@@ -14,12 +14,12 @@
 #include <qt/clientmodel.h>
 #include <qt/guiutil.h>
 
+#include <QHash>
 #include <QObject>
 #include <QStringList>
 
 #include <univalue.h>
 
-#include <map>
 #include <set>
 
 namespace {
@@ -354,7 +354,7 @@ void MasternodeModel::remove(int row)
 
 void MasternodeModel::reconcile(MasternodeEntryList&& entries)
 {
-    std::map<QString, int> existing;
+    QHash<QString, int> existing;
     for (int i = 0; i < static_cast<int>(m_data.size()); ++i) {
         existing[m_data[i]->proTxHash()] = i;
     }
@@ -364,7 +364,7 @@ void MasternodeModel::reconcile(MasternodeEntryList&& entries)
     std::vector<std::unique_ptr<MasternodeEntry>> add;
     for (auto& entry : entries) {
         if (auto it = existing.find(entry->proTxHash()); it != existing.end()) {
-            int idx = it->second;
+            int idx = it.value();
             present.insert(idx);
             if (m_data[idx]->toTie() != entry->toTie()) {
                 m_data[idx] = std::move(entry);
diff --git a/src/qt/masternodemodel.h b/src/qt/masternodemodel.h
index d09e4dbb03af..287117058109 100644
--- a/src/qt/masternodemodel.h
+++ b/src/qt/masternodemodel.h
@@ -41,16 +41,16 @@ class MasternodeEntry
     QString m_service{};
     QString m_type_description{};
     QString m_voting_address{};
-    std::optional<int32_t> m_collateral_index{std::nullopt};
-    std::optional<int32_t> m_consecutive_payments{std::nullopt};
-    std::optional<int32_t> m_pose_ban_height{std::nullopt};
-    std::optional<int32_t> m_pose_revived_height{std::nullopt};
-    std::optional<QString> m_collateral_hash{std::nullopt};
-    std::optional<QString> m_network_addresses{std::nullopt};
-    std::optional<QString> m_platform_https_addresses{std::nullopt};
-    std::optional<QString> m_platform_node_id{std::nullopt};
-    std::optional<QString> m_platform_p2p_addresses{std::nullopt};
-    std::optional<QString> m_pub_key_operator{std::nullopt};
+    std::optional<int32_t> m_collateral_index{};
+    std::optional<int32_t> m_consecutive_payments{};
+    std::optional<int32_t> m_pose_ban_height{};
+    std::optional<int32_t> m_pose_revived_height{};
+    std::optional<QString> m_collateral_hash{};
+    std::optional<QString> m_network_addresses{};
+    std::optional<QString> m_platform_https_addresses{};
+    std::optional<QString> m_platform_node_id{};
+    std::optional<QString> m_platform_p2p_addresses{};
+    std::optional<QString> m_pub_key_operator{};
     uint16_t m_operator_reward_pct{0};
 
 public:
diff --git a/src/qt/proposalmodel.cpp b/src/qt/proposalmodel.cpp
index ffdd59f2076b..ea0ccbff362a 100644
--- a/src/qt/proposalmodel.cpp
+++ b/src/qt/proposalmodel.cpp
@@ -16,6 +16,7 @@
 #include <univalue.h>
 
 #include <algorithm>
+#include <cmath>
 
 Proposal::Proposal(ClientModel* _clientModel, const CGovernanceObject& _govObj) :
     clientModel{_clientModel},
@@ -40,7 +41,7 @@ Proposal::Proposal(ClientModel* _clientModel, const CGovernanceObject& _govObj)
     }
 
     if (const UniValue& amountValue = prop_data.find_value("payment_amount"); amountValue.isNum()) {
-        m_paymentAmount = amountValue.get_real();
+        m_paymentAmount = llround(amountValue.get_real() * COIN);
     }
 
     if (const UniValue& urlValue = prop_data.find_value("url"); urlValue.isStr()) {
@@ -121,7 +122,7 @@ QVariant ProposalModel::data(const QModelIndex& index, int role) const
         case Column::END_DATE:
             return proposal->endDate().date();
         case Column::PAYMENT_AMOUNT: {
-            return BitcoinUnits::floorWithUnit(m_display_unit, proposal->paymentAmount() * COIN, false,
+            return BitcoinUnits::floorWithUnit(m_display_unit, proposal->paymentAmount(), false,
                                                BitcoinUnits::SeparatorStyle::ALWAYS);
         }
         case Column::IS_ACTIVE:
@@ -146,7 +147,7 @@ QVariant ProposalModel::data(const QModelIndex& index, int role) const
         case Column::END_DATE:
             return proposal->endDate();
         case Column::PAYMENT_AMOUNT:
-            return proposal->paymentAmount();
+            return qlonglong(proposal->paymentAmount());
         case Column::IS_ACTIVE:
             return proposal->isActive();
         case Column::VOTING_STATUS:
@@ -257,6 +258,14 @@ void ProposalModel::reconcile(ProposalList&& proposals)
     }
 }
 
+void ProposalModel::setDisplayUnit(const BitcoinUnit& display_unit)
+{
+    m_display_unit = display_unit;
+    if (!m_data.empty()) {
+        Q_EMIT dataChanged(createIndex(0, Column::PAYMENT_AMOUNT), createIndex(rowCount() - 1, Column::PAYMENT_AMOUNT));
+    }
+}
+
 void ProposalModel::setVotingParams(int newAbsVoteReq)
 {
     if (this->nAbsVoteReq == newAbsVoteReq) {
diff --git a/src/qt/proposalmodel.h b/src/qt/proposalmodel.h
index 6d09c3f7fa65..e2918298d9bf 100644
--- a/src/qt/proposalmodel.h
+++ b/src/qt/proposalmodel.h
@@ -23,7 +23,7 @@ class Proposal
     ClientModel* clientModel;
     const CGovernanceObject govObj;
 
-    double m_paymentAmount{0.0};
+    CAmount m_paymentAmount{0};
     QDateTime m_endDate{};
     QDateTime m_startDate{};
     QString m_hash{};
@@ -34,7 +34,7 @@ class Proposal
     explicit Proposal(ClientModel* _clientModel, const CGovernanceObject& _govObj);
 
     bool isActive() const;
-    double paymentAmount() const { return m_paymentAmount; }
+    CAmount paymentAmount() const { return m_paymentAmount; }
     int GetAbsoluteYesCount() const;
     QDateTime endDate() const { return m_endDate; }
     QDateTime startDate() const { return m_startDate; }
@@ -82,7 +82,7 @@ class ProposalModel : public QAbstractTableModel
     void append(std::unique_ptr<Proposal>&& proposal);
     void remove(int row);
     void reconcile(ProposalList&& proposals);
-    void setDisplayUnit(const BitcoinUnit& display_unit) { m_display_unit = display_unit; }
+    void setDisplayUnit(const BitcoinUnit& display_unit);
     void setVotingParams(int nAbsVoteReq);
     const Proposal* getProposalAt(const QModelIndex& index) const;
 
diff --git a/src/qt/proposalwizard.cpp b/src/qt/proposalwizard.cpp
index 7e5c01d15378..4e96f0a81b23 100644
--- a/src/qt/proposalwizard.cpp
+++ b/src/qt/proposalwizard.cpp
@@ -8,6 +8,7 @@
 
 #include <governance/object.h>
 #include <governance/validators.h>
+#include <util/moneystr.h>
 
 #include <interfaces/node.h>
 #include <qt/bitcoinamountfield.h>
@@ -20,8 +21,6 @@
 #include <qt/walletmodel.h>
 
 #include <QDateTime>
-#include <QJsonDocument>
-#include <QJsonObject>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMessageBox>
@@ -29,6 +28,8 @@
 #include <QStackedWidget>
 #include <QTimer>
 
+#include <univalue.h>
+
 #include <algorithm>
 
 namespace {
@@ -36,9 +37,8 @@ namespace {
 static QString toHex(const QByteArray& bytes) { return QString(bytes.toHex()); }
 } // namespace
 
-ProposalWizard::ProposalWizard(interfaces::Node& node, WalletModel* walletModel, QWidget* parent) :
+ProposalWizard::ProposalWizard(WalletModel* walletModel, QWidget* parent) :
     QDialog(parent),
-    m_node(node),
     m_walletModel(walletModel),
     m_ui(new Ui::ProposalWizard)
 {
@@ -68,6 +68,8 @@ ProposalWizard::ProposalWizard(interfaces::Node& node, WalletModel* walletModel,
     {
         // Load governance parameters
         const auto info = m_walletModel->node().gov().getGovernanceInfo();
+        m_superblock_cycle = info.superblockcycle;
+        m_target_spacing = info.targetSpacing;
         m_relayRequiredConfs = info.relayRequiredConfs;
         m_requiredConfs = info.requiredConfs;
 
@@ -77,7 +79,7 @@ ProposalWizard::ProposalWizard(interfaces::Node& node, WalletModel* walletModel,
         const int cycle = info.superblockcycle;
         for (int i = 0; i < 12; ++i) {
             const int sbHeight = nextSb + i * cycle;
-            const qint64 secs = static_cast<qint64>(i) * cycle * Params().GetConsensus().nPowTargetSpacing;
+            const qint64 secs = static_cast<qint64>(i) * cycle * m_target_spacing;
             const auto dt = QDateTime::currentDateTimeUtc().addSecs(secs).toLocalTime();
             m_ui->comboFirstPayment->addItem(QLocale().toString(dt, QLocale::ShortFormat), sbHeight);
         }
@@ -131,53 +133,43 @@ ProposalWizard::~ProposalWizard()
 
 void ProposalWizard::buildJsonAndHex()
 {
+    const int64_t multiplier = std::numeric_limits<int64_t>::max() / std::max<int64_t>(1, m_target_spacing);
+
     // Compute start/end epochs from selected superblocks
-    int start_epoch = 0;
-    int end_epoch = 0;
-    int firstSb = m_ui->comboFirstPayment->currentData().toInt();
-    int payments = m_ui->comboPayments->currentData().toInt();
-    if (firstSb > 0 && payments > 0) {
-        const int cycle = Params().GetConsensus().nSuperblockCycle;
-        if (cycle > 0) {
-            const int prevSb = firstSb - cycle;
-            const int lastSb = firstSb + (payments - 1) * cycle;
-            const int nextAfterLast = lastSb + cycle;
+    int64_t start_epoch = 0;
+    int64_t end_epoch = 0;
+    const int64_t first_sb = m_ui->comboFirstPayment->currentData().toInt();
+    const int64_t payments = m_ui->comboPayments->currentData().toInt();
+    if (first_sb > 0 && payments > 0) {
+        if (m_superblock_cycle > 0) {
+            const int64_t prev_sb{first_sb - m_superblock_cycle};
+            const int64_t last_sb{first_sb + (payments - 1) * m_superblock_cycle};
+            const int64_t next_sb{last_sb + m_superblock_cycle};
             // Midpoints in blocks; convert roughly to seconds relative to now
-            const int startMidBlocks = (firstSb + prevSb) / 2;
-            const int endMidBlocks = (lastSb + nextAfterLast) / 2;
+            const int64_t start_blocks{(first_sb + prev_sb) / 2};
+            const int64_t end_blocks{(last_sb + next_sb) / 2};
             // We don't know absolute time for those heights in GUI; approximate using consensus block time
             // Use now as baseline; this is only to pass validator and give a stable window
-            const qint64 now = QDateTime::currentSecsSinceEpoch();
-            const int64_t targetSpacing = Params().GetConsensus().nPowTargetSpacing; // seconds
-            const int64_t deltaStartBlocks = static_cast<int64_t>(startMidBlocks) - static_cast<int64_t>(firstSb);
-            const int64_t deltaEndBlocks = static_cast<int64_t>(endMidBlocks) - static_cast<int64_t>(firstSb);
-            // Guard against overflow when multiplying
-            const int64_t maxMultiplier = std::numeric_limits<int64_t>::max() / std::max<int64_t>(1, targetSpacing);
-            const int64_t clampedDeltaStart = std::clamp<int64_t>(deltaStartBlocks, -maxMultiplier, maxMultiplier);
-            const int64_t clampedDeltaEnd = std::clamp<int64_t>(deltaEndBlocks, -maxMultiplier, maxMultiplier);
-            const int64_t startOffsetSecs = clampedDeltaStart * targetSpacing;
-            const int64_t endOffsetSecs = clampedDeltaEnd * targetSpacing;
-            const int64_t startEpoch64 = now + startOffsetSecs;
-            const int64_t endEpoch64 = now + endOffsetSecs;
-            // Clamp to 32-bit int range used by validator
-            start_epoch = static_cast<int>(
-                std::clamp<int64_t>(startEpoch64, std::numeric_limits<int>::min(), std::numeric_limits<int>::max()));
-            end_epoch = static_cast<int>(
-                std::clamp<int64_t>(endEpoch64, std::numeric_limits<int>::min(), std::numeric_limits<int>::max()));
+            const qint64 now{QDateTime::currentSecsSinceEpoch()};
+            const int64_t delta_start{start_blocks - first_sb};
+            const int64_t delta_end{end_blocks - first_sb};
+            // Guard against overflow when multiplying by clamping deltas first
+            start_epoch = now + std::clamp<int64_t>(delta_start, -multiplier, multiplier) * m_target_spacing;
+            end_epoch = now + std::clamp<int64_t>(delta_end, -multiplier, multiplier) * m_target_spacing;
         }
     }
 
-    QJsonObject o;
-    o.insert("name", m_ui->editName->text());
-    o.insert("payment_address", m_ui->editPayAddr->text());
-    const auto formatted = BitcoinUnits::format(BitcoinUnits::Unit::DASH, m_ui->paymentAmount->value(), false,
-                                                BitcoinUnits::SeparatorStyle::NEVER);
-    o.insert("payment_amount", formatted.toDouble());
-    o.insert("url", m_ui->editUrl->text());
-    if (start_epoch > 0) o.insert("start_epoch", start_epoch);
-    if (end_epoch > 0) o.insert("end_epoch", end_epoch);
-    o.insert("type", 1);
-    const auto json = QJsonDocument(o).toJson(QJsonDocument::Compact);
+    UniValue o(UniValue::VOBJ);
+    o.pushKV("name", m_ui->editName->text().toStdString());
+    o.pushKV("payment_address", m_ui->editPayAddr->text().toStdString());
+    UniValue amount;
+    amount.setNumStr(FormatMoney(m_ui->paymentAmount->value()));
+    o.pushKV("payment_amount", amount);
+    o.pushKV("url", m_ui->editUrl->text().toStdString());
+    if (start_epoch > 0) o.pushKV("start_epoch", start_epoch);
+    if (end_epoch > 0) o.pushKV("end_epoch", end_epoch);
+    o.pushKV("type", 1);
+    const auto json{QByteArray::fromStdString(o.write())};
     m_ui->plainJson->setPlainText(QString::fromUtf8(json));
     m_hex = toHex(json);
     m_ui->editHex->setText(m_hex);
@@ -347,11 +339,17 @@ void ProposalWizard::updateLabels()
 {
     if (m_walletModel && m_walletModel->getOptionsModel()) {
         const auto unit = m_walletModel->getOptionsModel()->getDisplayUnit();
-        const CAmount totalAmount = static_cast<CAmount>(m_ui->paymentAmount->value() *
-                                                         m_ui->comboPayments->currentData().toInt());
+        const CAmount per_payment = m_ui->paymentAmount->value();
+        const int payments = m_ui->comboPayments->currentData().toInt();
+        CAmount total{0};
+        if (payments > 0 && per_payment > 0 && per_payment <= MAX_MONEY / payments) {
+            total = per_payment * payments;
+        } else if (payments > 0 && per_payment > 0) {
+            total = MAX_MONEY;
+        }
         m_ui->labelTotalValue->setText(
-            BitcoinUnits::formatWithUnit(unit, totalAmount, false, BitcoinUnits::SeparatorStyle::ALWAYS));
-        m_fee_formatted = BitcoinUnits::formatWithUnit(unit, GOVERNANCE_PROPOSAL_FEE_TX, false,
+            BitcoinUnits::formatWithUnit(unit, total, /*plussign=*/false, BitcoinUnits::SeparatorStyle::ALWAYS));
+        m_fee_formatted = BitcoinUnits::formatWithUnit(unit, GOVERNANCE_PROPOSAL_FEE_TX, /*plussign=*/false,
                                                        BitcoinUnits::SeparatorStyle::ALWAYS);
         m_ui->labelFeeValue->setText(m_fee_formatted.isEmpty() ? QString("-") : m_fee_formatted);
         // Dynamic header/subheader and prepare text
diff --git a/src/qt/proposalwizard.h b/src/qt/proposalwizard.h
index 02b4f6d841bf..d38998d58d8d 100644
--- a/src/qt/proposalwizard.h
+++ b/src/qt/proposalwizard.h
@@ -14,9 +14,6 @@
 
 class QTimer;
 
-namespace interfaces {
-class Node;
-}
 namespace Ui {
 class SendCoinsEntry;
 }
@@ -28,7 +25,7 @@ class ProposalWizard : public QDialog
 {
     Q_OBJECT
 public:
-    explicit ProposalWizard(interfaces::Node& node, WalletModel* walletModel, QWidget* parent = nullptr);
+    explicit ProposalWizard(WalletModel* walletModel, QWidget* parent = nullptr);
     ~ProposalWizard();
 
 private Q_SLOTS:
@@ -46,7 +43,6 @@ private Q_SLOTS:
     void updateDisplayUnit();
 
 private:
-    interfaces::Node& m_node;
     WalletModel* m_walletModel;
     Ui::ProposalWizard* m_ui;
 
@@ -55,6 +51,8 @@ private Q_SLOTS:
     QString m_txid;
     QString m_fee_formatted;
     qint64 m_prepareTime{0};
+    int64_t m_superblock_cycle{0};
+    int64_t m_target_spacing{0};
     int m_relayRequiredConfs{1};
     int m_requiredConfs{6};
     int m_lastConfs{-1};
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
index c260dd23ffc9..fc6f621d7a2b 100644
--- a/src/wallet/interfaces.cpp
+++ b/src/wallet/interfaces.cpp
@@ -665,6 +665,10 @@ class WalletImpl : public Wallet
         out_fee_txid = tx->GetHash().ToString();
         return true;
     }
+    bool signGovernanceVote(const CKeyID& keyID, CGovernanceVote& vote) override
+    {
+        return m_wallet->SignGovernanceVote(keyID, vote);
+    }
     CWallet* wallet() override { return m_wallet.get(); }
 
     WalletContext& m_context;