diff --git a/Database/RethinkDB.hs b/Database/RethinkDB.hs
--- a/Database/RethinkDB.hs
+++ b/Database/RethinkDB.hs
@@ -4,8 +4,9 @@
 --
 -- /How to use/
 --
--- >>> {-# LANGUAGE OverloadedStrings #-}
--- >>> import qualified Database.RethinkDB as R
+-- > {-# LANGUAGE OverloadedStrings #-}
+-- > import qualified Database.RethinkDB as R
+-- > import qualified Database.RethinkDB.NoClash
 
 module Database.RethinkDB (
   -- * Accessing RethinkDB
@@ -16,6 +17,7 @@
   use,
   run, run', runOpts,
   next, collect,
+  RunOptions(..),
   Cursor,
   Response,
   Result(..),
@@ -84,7 +86,7 @@
   
   -- * Dates and times
   
-  UTCTime, ZonedTime,
+  UTCTime(..), ZonedTime(..),
   now, time, epochTime, iso8601, inTimezone, during,
   timezone, date, timeOfDay, year, month, day, dayOfWeek, dayOfYear, hours, minutes, seconds,
   toIso8601, toEpochTime,
diff --git a/Database/RethinkDB/Functions.hs b/Database/RethinkDB/Functions.hs
--- a/Database/RethinkDB/Functions.hs
+++ b/Database/RethinkDB/Functions.hs
@@ -106,8 +106,8 @@
 
 -- | Limit the size of a sequence.
 -- Called /limit/ in the official drivers
-take :: (Expr a, Expr b) => a -> b -> ReQL
-take a b = op LIMIT (a, b) ()
+take :: (Expr n, Expr seq) => n -> seq -> ReQL
+take n s = op LIMIT (s, n) ()
 
 -- | Cut out part of a sequence
 slice :: (Expr a, Expr b, Expr c) => a -> b -> c -> ReQL
@@ -165,7 +165,7 @@
 
 -- | The sum of a sequence
 sum :: (Expr s) => s -> ReQL
-sum = reduce ((+) :: ReQL -> ReQL -> ReQL) (0 :: ReQL)
+sum = reduce ((+) :: ReQL -> ReQL -> ReQL) (num 0)
 
 -- | The average of a sequence
 avg :: (Expr s) => s -> ReQL
@@ -271,7 +271,7 @@
 
 -- | List the tables in a database
 tableList :: Database -> ReQL
-tableList (O.Database name) = op DB_LIST [name] ()
+tableList (O.Database name) = op TABLE_LIST [name] ()
 
 -- | Get a document by primary key 
 get :: (Expr s, Expr k) => k -> s -> ReQL
@@ -374,9 +374,9 @@
 keys :: Expr obj => obj -> ReQL
 keys o = op KEYS [o] ()
 
--- | Match a string to a regulr expression.
+-- | Match a string to a regular expression.
 -- Called /match/ in the official drivers
-(=~) :: (Expr string, Expr regex) => string -> regex -> ReQL
+(=~) :: (Expr string) => string -> ReQL -> ReQL
 s =~ r = op MATCH (s, r) ()
 
 -- | Apply a function to a list of arguments.
diff --git a/Database/RethinkDB/MapReduce.hs b/Database/RethinkDB/MapReduce.hs
--- a/Database/RethinkDB/MapReduce.hs
+++ b/Database/RethinkDB/MapReduce.hs
@@ -62,7 +62,7 @@
                 (REDUCE, [Map m, None f], _) | Just mbase <- optargsToBase optargs ->
                   MapReduce m (toFun2 f) (maybe id (toFun2 f) mbase)
                 (COUNT, [Map _], []) ->
-                  MapReduce (const 1) (\a b -> op ADD (a, b) ()) id
+                  MapReduce (const (num 1)) (\a b -> op ADD (a, b) ()) id
                 (tt, (Map m : _), _) | tt `elem` mappableTypes ->
                   (Map ((\x -> op tt (expr x : map expr (tail args)) (noRecurse : map baseAttrToAttr optargs)) . m))
                 _ -> rebuild
diff --git a/Database/RethinkDB/NoClash.hs b/Database/RethinkDB/NoClash.hs
new file mode 100644
--- /dev/null
+++ b/Database/RethinkDB/NoClash.hs
@@ -0,0 +1,15 @@
+-- | This module exports all of Database.RethinkDB except for the
+-- names that clash with Prelude or Data.Time
+
+module Database.RethinkDB.NoClash (
+  module Database.RethinkDB,
+  -- module Prelude, module Data.Time -- Uncomment to let GHC detect clashes
+  ) where
+
+import Data.Time
+
+import Database.RethinkDB hiding (
+  UTCTime, ZonedTime,
+  (*), (+), (-), (/),
+  sum, (++), (.), map, mod, (!!), concatMap, drop, length, take, (&&),
+  not, (||), (/=), (<), (<=), (>), (>=), error, (==), filter)
diff --git a/rethinkdb.cabal b/rethinkdb.cabal
--- a/rethinkdb.cabal
+++ b/rethinkdb.cabal
@@ -1,5 +1,5 @@
 name:                rethinkdb
-version:             1.8.0.1
+version:             1.8.0.2
 description:         RethinkDB is a distributed document store with a powerful query language.
 synopsis:            RethinkDB driver for Haskell
 homepage:            http://github.com/atnnn/haskell-rethinkdb
@@ -13,6 +13,7 @@
 
 library
   exposed-modules:     Database.RethinkDB
+                       Database.RethinkDB.NoClash
                        Database.RethinkDB.Driver
                        Database.RethinkDB.Functions
                        Database.RethinkDB.Time