4 files changed, 8 insertions, 4 deletions
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
index 37c47f2232..66083fe1ee 100644
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -786,7 +786,7 @@ CFeeRate CBlockPolicyEstimator::estimateSmartFee(int confTarget, int *answerFoun
          * This is necessary to preserve monotonically increasing estimates.
          * For non-conservative estimates we do the same thing for 2*target, but
          * for conservative estimates we want to skip these shorter horizons
-         * checks for 2*target becuase we are taking the max over all time
+         * checks for 2*target because we are taking the max over all time
          * horizons so we already have monotonically increasing estimates and
          * the purpose of conservative estimates is not to let short term
          * fluctuations lower our estimates by too much.
diff --git a/src/policy/fees.h b/src/policy/fees.h
index f527c85004..e99fec2c39 100644
--- a/src/policy/fees.h
+++ b/src/policy/fees.h
@@ -51,7 +51,7 @@ class TxConfirmStats;
  * blocks.  This is is tracked in 3 different data sets each up to a maximum
  * number of periods. Within each data set we have an array of counters in each
  * feerate bucket and we increment all the counters from Y' up to max periods
- * representing that a tx was successfullly confirmed in less than or equal to
+ * representing that a tx was successfully confirmed in less than or equal to
  * that many periods. We want to save a history of this information, so at any
  * time we have a counter of the total number of transactions that happened in a
  * given feerate bucket and the total number that were confirmed in each of the
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 42dc31760b..76aab23983 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -98,7 +98,11 @@ CCoinsViewCursor *CCoinsViewDB::Cursor() const
        that restriction.  */
     i->pcursor->Seek(DB_COINS);
     // Cache key of first record
-    i->pcursor->GetKey(i->keyTmp);
+    if (i->pcursor->Valid()) {
+        i->pcursor->GetKey(i->keyTmp);
+    } else {
+        i->keyTmp.first = 0; // Make sure Valid() and GetKey() return false
+    }
     return i;
 }
 
diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp
index c10a9eccd9..99120d290c 100644
--- a/src/wallet/feebumper.cpp
+++ b/src/wallet/feebumper.cpp
@@ -255,7 +255,7 @@ bool CFeeBumper::commit(CWallet *pWallet)
     }
     CWalletTx& oldWtx = pWallet->mapWallet[txid];
 
-    // make sure the transaction still has no descendants and hasen't been mined in the meantime
+    // make sure the transaction still has no descendants and hasn't been mined in the meantime
     if (!preconditionChecks(pWallet, oldWtx)) {
         return false;
     }