diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,37 +4,42 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 0.9.8
+### Changed
+- Increase version of haskoin-core to 0.9.0.
+- Fix some tests.
+
 ## 0.9.7
 ### Added
 - More debugging.
 
-### Change
+### Changed
 - Be defensive against duplicate peers.
 - Increase interval between housekeeping pings.
 - Replace peers in database atomically.
 
 ## 0.9.6
-### Change
+### Changed
 - Randomize known peers instead of keeping scores.
 - Simplify peer management code to avoid freezes.
 - Merge logic for chain and manager.
 
 ## 0.9.5
-### Change
+### Changed
 - Do not record new peers in database when peer discovery is disabled.
 
 ## 0.9.4
-### Change
+### Changed
 - Don't spam best block events.
 
 ## 0.9.3
-### Change
+### Changed
 - Correct display of milliseconds in log.
 - Correct bug when receiving headers from unknown peer.
 - Simplify chain syncing code.
 
 ## 0.9.2
-### Change
+### Changed
 - Peer dies immediately when receiving a bad message.
 
 ## 0.9.1
diff --git a/haskoin-node.cabal b/haskoin-node.cabal
--- a/haskoin-node.cabal
+++ b/haskoin-node.cabal
@@ -4,10 +4,10 @@
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 2a766eed5c0c8979b073e662fc635448c7381959bd7e02195104296ba88bda01
+-- hash: 65356f705bfa6d70c54e5ab415fc6dcee69d8acb4ab8948a67205d20102c9c82
 
 name:           haskoin-node
-version:        0.9.7
+version:        0.9.8
 synopsis:       Haskoin Node P2P library for Bitcoin and Bitcoin Cash
 description:    Bitcoin and Bitcoin Cash peer-to-peer protocol library featuring headers-first synchronisation.
 category:       Bitcoin, Finance, Network
diff --git a/src/Network/Haskoin/Node/Chain.hs b/src/Network/Haskoin/Node/Chain.hs
--- a/src/Network/Haskoin/Node/Chain.hs
+++ b/src/Network/Haskoin/Node/Chain.hs
@@ -207,7 +207,7 @@
 data ChainDataVersionKey = ChainDataVersionKey
     deriving (Eq, Ord, Show)
 
-instance Key ChainDataVersionKey
+instance R.Key ChainDataVersionKey
 instance KeyValue ChainDataVersionKey Word32
 
 instance Serialize ChainDataVersionKey where
diff --git a/src/Network/Haskoin/Node/Manager.hs b/src/Network/Haskoin/Node/Manager.hs
--- a/src/Network/Haskoin/Node/Manager.hs
+++ b/src/Network/Haskoin/Node/Manager.hs
@@ -489,7 +489,7 @@
         return PeerDataVersionKey
     put PeerDataVersionKey = S.putWord8 0x82
 
-instance Key PeerDataVersionKey
+instance R.Key PeerDataVersionKey
 instance KeyValue PeerDataVersionKey Word32
 
 instance Serialize PeerAddress where
@@ -501,7 +501,7 @@
         encodeSockAddr a
     put PeerAddressBase = S.putWord8 0x81
 
-instance Key PeerAddress
+instance R.Key PeerAddress
 instance KeyValue PeerAddress ()
 
 -- | Add a peer.
diff --git a/test/Haskoin/NodeSpec.hs b/test/Haskoin/NodeSpec.hs
--- a/test/Haskoin/NodeSpec.hs
+++ b/test/Haskoin/NodeSpec.hs
@@ -10,6 +10,7 @@
 import           Control.Monad
 import           Control.Monad.Logger
 import           Control.Monad.Trans
+import           Data.Maybe
 import qualified Database.RocksDB     as R
 import           Haskoin
 import           Haskoin.Node
@@ -41,7 +42,9 @@
                     h2 =
                         "00000000851f278a8b2c466717184aae859af5b83c6f850666afbc349cf61577"
                 p <- waitForPeer nodeEvents
-                Just [b1, b2] <- peerGetBlocks net 30 p [h1, h2]
+                pbs <- peerGetBlocks net 30 p [h1, h2]
+                pbs `shouldSatisfy` isJust
+                let Just [b1, b2] = pbs
                 headerHash (blockHeader b1) `shouldBe` h1
                 headerHash (blockHeader b2) `shouldBe` h2
                 let testMerkle b =