diff --git a/src/runtime/haskell/PGF/TypeCheck.hs b/src/runtime/haskell/PGF/TypeCheck.hs
index 3c2580d59..5db4ef439 100644
--- a/src/runtime/haskell/PGF/TypeCheck.hs
+++ b/src/runtime/haskell/PGF/TypeCheck.hs
@@ -519,7 +519,7 @@ eqValue fail suspend k v1 v2 = do
 
     bind i scope cs env vs0 v = do
       let k  = scopeSize scope
-          vs  = reverse (take k env) ++ vs0
+          vs  = reverse (List.take k env) ++ vs0
           xs  = nub [i | VGen i [] <- vs]
       if length vs /= length xs
         then suspend i (\e -> apply env e vs0 >>= \iv -> eqValue fail suspend k iv v)
diff --git a/src/server/CGIUtils.hs b/src/server/CGIUtils.hs
index 2e652b4e6..04bb8f22c 100644
--- a/src/server/CGIUtils.hs
+++ b/src/server/CGIUtils.hs
@@ -7,7 +7,7 @@ module CGIUtils (throwCGIError, handleCGIErrors,
                  outputHTML,outputPlain,outputText) where
 
 import Control.Exception(Exception(..),SomeException(..),throw)
-import Data.Dynamic(Typeable,cast)
+import Data.Typeable(Typeable,cast)
 import Prelude hiding (catch)
 import System.IO(hPutStrLn,stderr)
 #ifndef mingw32_HOST_OS