diff --git a/src/ATrade/Broker/Client.hs b/src/ATrade/Broker/Client.hs
index 429af2f..19f9beb 100644
--- a/src/ATrade/Broker/Client.hs
+++ b/src/ATrade/Broker/Client.hs
@@ -113,7 +113,7 @@ brokerClientThread socketIdentity ctx ep cmd comp killMv secParams logger = fina
         log Debug "Broker.Client" "Connected"
         isTimeout <- newIORef False
 
-        whileM_ (andM [isNothing <$> tryReadMVar killMv, (== False) <$> readIORef isTimeout]) $ do
+        whileM_ (andM [isNothing <$> tryReadMVar killMv, not <$> readIORef isTimeout]) $ do
           (request, resp) <- takeMVar cmd
           send sock [] (BL.toStrict $ encode request)
           incomingMessage <- timeout 5000000 $ receive sock
@@ -159,6 +159,7 @@ notificationThread clientIdentity callbacks ctx ep idCounter cmdVar killMv secPa
 
       initialSqnum <- requestCurrentSqnum cmdVar idCounter clientIdentity
 
+      log Debug "Broker.Client" $ "Got current sqnum: " <> (T.pack . show) initialSqnum
       notifSqnumRef <- newIORef initialSqnum
       whileM_ (isNothing <$> tryReadMVar killMv) $ do
         evs <- poll 5000 [Sock sock [In] Nothing]
diff --git a/src/ATrade/Broker/Server.hs b/src/ATrade/Broker/Server.hs
index 9c0bc13..436f71e 100644
--- a/src/ATrade/Broker/Server.hs
+++ b/src/ATrade/Broker/Server.hs
@@ -208,7 +208,7 @@ brokerServerThread state logger = finally brokerServerThread' cleanup
       unless (null . L.head $ events) $ do
         msg <- receiveMulti sock
         case msg of
-          [peerId, _, payload] ->
+          [peerId, _, payload] -> do
             case eitherDecode . BL.fromStrict $ payload of
               Right request -> do
                 let sqnum = requestSqnum request
@@ -266,6 +266,7 @@ brokerServerThread state logger = finally brokerServerThread' cleanup
               log Warning "Broker.Server" $ "Unknown account: " <> (orderAccountId order)
               return $ ResponseError "Unknown account"
         RequestCancelOrder sqnum clientIdentity localOrderId -> do
+          log Debug "Broker.Server" $ "Request: cancel order:" <> (T.pack . show) request
           m <- orderToBroker <$> readIORef state
           bm <- orderMap <$> readIORef state
           let fullOrderId = FullOrderId clientIdentity localOrderId