diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,13 @@
 #Change Log
+##0.6.0.3
+* Relaxed upper bounds on text and http-client versions 
+
 ##0.6.0.2
 * Added support for aeson > 0.8 and network > 2.6
 * Added support for the "X-Response-Body-Start" HTTP header used for error responses in newer http-client versions
+
+##0.6.0.1
+* Fixed Haddock parse errors. No code changes introduced in this version.
 
 ##0.6
 * Rather than WDSession serving dual roles as configuration and state, its functionality has been split into 2 respective types: WDConfig and WDSession.
diff --git a/src/Test/WebDriver/Capabilities.hs b/src/Test/WebDriver/Capabilities.hs
--- a/src/Test/WebDriver/Capabilities.hs
+++ b/src/Test/WebDriver/Capabilities.hs
@@ -127,10 +127,10 @@
                       , nativeEvents = Just True
                       }
 
-
 instance ToJSON Capabilities where
   toJSON Capabilities{..} =
-    object $ [ "browserName" .= browser
+    object $ filter (\p -> snd p /= Null)
+           $ [ "browserName" .= browser
              , "version" .= version
              , "platform" .= platform
              , "proxy" .= proxy
diff --git a/src/Test/WebDriver/Monad.hs b/src/Test/WebDriver/Monad.hs
--- a/src/Test/WebDriver/Monad.hs
+++ b/src/Test/WebDriver/Monad.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE FlexibleContexts, TypeFamilies, GeneralizedNewtypeDeriving,
-             MultiParamTypeClasses #-}
+             MultiParamTypeClasses, CPP, UndecidableInstances #-}
 module Test.WebDriver.Monad
        ( WD(..), runWD, runSession, withSession, finallyClose, closeOnException, dumpSessionHistory
        ) where
@@ -30,6 +30,15 @@
   liftBase = WD . liftBase
 
 instance MonadBaseControl IO WD where
+#if MIN_VERSION_monad_control(1,0,0)
+  type StM WD a = StM (StateT WDSession IO) a
+
+  liftBaseWith f = WD $
+    liftBaseWith $ \runInBase ->
+    f (\(WD sT) -> runInBase $ sT)
+
+  restoreM = WD . restoreM
+#else
   data StM WD a = StWD {unStWD :: StM (StateT WDSession IO) a}
 
   liftBaseWith f = WD $
@@ -37,6 +46,7 @@
     f (\(WD sT) -> liftM StWD . runInBase $ sT)
 
   restoreM = WD . restoreM . unStWD
+#endif
 
 instance WDSessionState WD where
   getSession = WD get
diff --git a/webdriver.cabal b/webdriver.cabal
--- a/webdriver.cabal
+++ b/webdriver.cabal
@@ -1,5 +1,5 @@
 Name: webdriver
-Version: 0.6.0.3
+Version: 0.6.0.4
 Cabal-Version: >= 1.8
 License: BSD3
 License-File: LICENSE
@@ -43,7 +43,7 @@
                  , base64-bytestring >= 1.0 && < 1.1
                  , mtl >= 2.0 && < 2.3
                  , transformers >= 0.2 && < 0.5
-                 , monad-control == 0.3.*     
+                 , monad-control >= 0.3 && < 1.1
                  , transformers-base >= 0.1 && < 1.0
                  , lifted-base >= 0.1 && < 0.3
                  , zip-archive >= 0.1.1.8 && < 0.3