diff --git a/avers-server.cabal b/avers-server.cabal
--- a/avers-server.cabal
+++ b/avers-server.cabal
@@ -1,5 +1,5 @@
 name:                avers-server
-version:             0.1.0
+version:             0.1.0.1
 synopsis:            Server implementation of the Avers API
 description:         Server implementation of the Avers API
 homepage:            http://github.com/wereHamster/avers-server
@@ -43,9 +43,8 @@
    , memory
    , mtl
    , resource-pool
-   , rethinkdb-client-driver
    , servant
-   , servant-server
+   , servant-server >= 0.12
    , stm
    , text
    , time
diff --git a/src/Avers/Server/Instances.hs b/src/Avers/Server/Instances.hs
--- a/src/Avers/Server/Instances.hs
+++ b/src/Avers/Server/Instances.hs
@@ -48,6 +48,7 @@
                     Left _ -> delayedFailFatal err400
                     Right sId -> pure $ CredSessionId $ SessionId sId
 
+    hoistServerWithContext _ pc nt s = hoistServerWithContext (Proxy :: Proxy sublayout) pc nt . s
 
 
 instance (HasServer sublayout context) => HasServer (SessionId :> sublayout) context where
@@ -68,7 +69,4 @@
                     Left _ -> delayedFailFatal err401
                     Right sId -> pure $ SessionId sId
 
-
-
-instance ToHttpApiData SetCookie where
-    toUrlPiece = T.decodeUtf8 . toByteString' . renderSetCookie
+    hoistServerWithContext _ pc nt s = hoistServerWithContext (Proxy :: Proxy sublayout) pc nt . s