diff --git a/charset.cabal b/charset.cabal
--- a/charset.cabal
+++ b/charset.cabal
@@ -1,5 +1,5 @@
 name:          charset
-version:       0.3.7
+version:       0.3.7.1
 license:       BSD3
 license-File:  LICENSE
 copyright:     (c) Edward Kmett 2010-2012
diff --git a/src/Data/CharSet.hs b/src/Data/CharSet.hs
--- a/src/Data/CharSet.hs
+++ b/src/Data/CharSet.hs
@@ -1,12 +1,9 @@
 {-# OPTIONS_GHC -fspec-constr #-}
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE DeriveDataTypeable #-}
 #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702
 {-# LANGUAGE Trustworthy #-}
 #endif
-#if MIN_VERSION_base(4,7,0)
-{-# LANGUAGE DeriveDataTypeable #-}
-{-# LANGUAGE StandaloneDeriving #-}
-#endif
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.CharSet
@@ -95,6 +92,7 @@
 import Text.Read
 
 data CharSet = CharSet !Bool {-# UNPACK #-} !ByteSet !IntSet
+  deriving Typeable
 
 charSet :: Bool -> IntSet -> CharSet
 charSet b s = CharSet b (ByteSet.fromList (fmap headByte (I.toAscList s))) s
@@ -278,21 +276,6 @@
 numChars :: Int
 numChars = oh - ol + 1
 {-# INLINE numChars #-}
-
-#if MIN_VERSION_base(4,7,0)
-deriving instance Typeable CharSet
-#else
-instance Typeable CharSet where
-  typeOf _ = mkTyConApp charSetTyCon []
-
-charSetTyCon :: TyCon
-#if MIN_VERSION_base(4,4,0)
-charSetTyCon = mkTyCon3 "charset" "Data.CharSet" "CharSet"
-#else
-charSetTyCon = mkTyCon "Data.CharSet.CharSet"
-#endif
-{-# NOINLINE charSetTyCon #-}
-#endif
 
 instance Data CharSet where
   gfoldl k z set
diff --git a/src/Data/CharSet/Unicode.hs b/src/Data/CharSet/Unicode.hs
--- a/src/Data/CharSet/Unicode.hs
+++ b/src/Data/CharSet/Unicode.hs
@@ -9,7 +9,7 @@
 -- Portability :  portable
 --
 -- Provides unicode general categories, which are typically connoted by
--- @\p{Ll}@ or @\p{Modifier_Letter}@. Lookups can be constructed using 'categories'
+-- @\\p{Ll}@ or @\\p{Modifier_Letter}@. Lookups can be constructed using 'categories'
 -- or individual character sets can be used directly.
 -------------------------------------------------------------------------------
 
diff --git a/src/Data/CharSet/Unicode/Category.hs b/src/Data/CharSet/Unicode/Category.hs
--- a/src/Data/CharSet/Unicode/Category.hs
+++ b/src/Data/CharSet/Unicode/Category.hs
@@ -9,7 +9,7 @@
 -- Portability :  DeriveDataTypeable
 --
 -- Provides unicode general categories, which are typically connoted by
--- @\p{Ll}@ or @\p{Modifier_Letter}@. Lookups can be constructed using 'categories'
+-- @\\p{Ll}@ or @\\p{Modifier_Letter}@. Lookups can be constructed using 'categories'
 -- or individual character sets can be used directly.
 --
 -- A case, @_@ and @-@ insensitive lookup is provided by 'lookupCategory'