diff --git a/Yesod/Form.hs b/Yesod/Form.hs
index f2462148..5618e85f 100644
--- a/Yesod/Form.hs
+++ b/Yesod/Form.hs
@@ -8,7 +8,7 @@ module Yesod.Form
     ( -- * Data types
       GForm
     , FormResult (..)
-    , Enctype
+    , Enctype (..)
     , FormFieldSettings (..)
       -- * Type synonyms
     , Form
@@ -25,10 +25,11 @@ module Yesod.Form
     , fieldsToTable
     , fieldsToPlain
     , checkForm
-      -- * Fields
-    , module Yesod.Form.Fields
       -- * Template Haskell
     , mkToForm
+      -- * Re-exports
+    , module Yesod.Form.Fields
+    , module Yesod.Form.Class
     ) where
 
 import Yesod.Form.Core
diff --git a/Yesod/Handler.hs b/Yesod/Handler.hs
index f77e97e5..a4796f76 100644
--- a/Yesod/Handler.hs
+++ b/Yesod/Handler.hs
@@ -332,8 +332,8 @@ msgKey = "_MSG"
 -- instead, it will only appear in the next request.
 --
 -- See 'getMessage'.
-setMessage :: ToHtml h => h -> GHandler sub master ()
-setMessage = setSession msgKey . L.toString . renderHtml . toHtml
+setMessage :: Html -> GHandler sub master ()
+setMessage = setSession msgKey . L.toString . renderHtml
 
 -- | Gets the message in the user's session, if available, and then clears the
 -- variable.
diff --git a/Yesod/Helpers/Crud.hs b/Yesod/Helpers/Crud.hs
index ba22569e..88431266 100644
--- a/Yesod/Helpers/Crud.hs
+++ b/Yesod/Helpers/Crud.hs
@@ -17,7 +17,6 @@ import Yesod.Content
 import Yesod.Handler
 import Text.Hamlet
 import Yesod.Form
-import Yesod.Form.Class
 import Data.Monoid (mempty)
 import Language.Haskell.TH.Syntax