diff --git a/Data/Object/Html.hs b/Data/Object/Html.hs
index c1129d8a..0e1dc616 100644
--- a/Data/Object/Html.hs
+++ b/Data/Object/Html.hs
@@ -34,7 +34,6 @@ import Data.Object.Json
 import qualified Data.Text.Lazy as TL
 import Web.Encodings
 import Text.StringTemplate.Classes
-import qualified Data.Map as Map
 import Control.Arrow (second)
 import Data.Attempt
 
@@ -152,7 +151,9 @@ $(deriveSuccessConvs ''String ''Html
 instance ToSElem HtmlObject where
     toSElem (Scalar h) = STR $ TL.unpack $ cs h
     toSElem (Sequence hs) = LI $ map toSElem hs
-    toSElem (Mapping pairs) = SM $ Map.fromList $ map (second toSElem) pairs
+    toSElem (Mapping pairs) = helper $ map (second toSElem) pairs where
+        helper :: [(String, SElem b)] -> SElem b
+        helper = SM . cs
 
 #if TEST
 caseHtmlToText :: Assertion
diff --git a/yesod.cabal b/yesod.cabal
index 22725226..67c30672 100644
--- a/yesod.cabal
+++ b/yesod.cabal
@@ -48,7 +48,6 @@ library
                      convertible-text >= 0.2.0 && < 0.3,
                      clientsession >= 0.0.1 && < 0.1,
                      zlib >= 0.5.2.0 && < 0.6,
-                     containers >= 0.2.0.1 && < 0.3,
                      HStringTemplate >= 0.6.2 && < 0.7,
                      data-object-json >= 0.0.0 && < 0.1,
                      attempt >= 0.2.1 && < 0.3,
@@ -83,7 +82,7 @@ executable             runtests
                        test-framework-quickcheck,
                        test-framework-hunit,
                        HUnit,
-                       QuickCheck == 1.*
+                       QuickCheck >= 1 && < 2
     else
         Buildable: False
     ghc-options:     -Wall