diff --git a/blockchain/chain.go b/blockchain/chain.go
index c829b61c..0e48b694 100644
--- a/blockchain/chain.go
+++ b/blockchain/chain.go
@@ -595,7 +595,8 @@ func (b *BlockChain) connectBlock(node *blockNode, block *btcutil.Block,
 
 	// Handle LBRY Claim Scripts
 	if b.claimTrie != nil {
-		if err := b.ParseClaimScripts(block, node, view, current); err != nil {
+		shouldFlush := current && b.chainParams.Net != wire.TestNet
+		if err := b.ParseClaimScripts(block, node, view, shouldFlush); err != nil {
 			return ruleError(ErrBadClaimTrie, err.Error())
 		}
 	}
diff --git a/mining/cpuminer/cpuminer.go b/mining/cpuminer/cpuminer.go
index 64cfaf50..7659d1a2 100644
--- a/mining/cpuminer/cpuminer.go
+++ b/mining/cpuminer/cpuminer.go
@@ -638,6 +638,6 @@ func New(cfg *Config) *CPUMiner {
 		numWorkers:        defaultNumWorkers,
 		updateNumWorkers:  make(chan struct{}),
 		queryHashesPerSec: make(chan float64),
-		updateHashes:      make(chan uint64),
+		updateHashes:      make(chan uint64, 512),
 	}
 }