diff --git a/Control/Monad/Stream.hs b/Control/Monad/Stream.hs
--- a/Control/Monad/Stream.hs
+++ b/Control/Monad/Stream.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -fno-implicit-prelude #-}
+{-# OPTIONS_GHC -XNoImplicitPrelude #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Control.Monad.Stream
diff --git a/Data/List/Stream.hs b/Data/List/Stream.hs
--- a/Data/List/Stream.hs
+++ b/Data/List/Stream.hs
@@ -1,10 +1,10 @@
-{-# OPTIONS_GHC -O2 -fbang-patterns -fdicts-cheap #-}
+{-# LANGUAGE BangPatterns #-}
 -- |
 -- Module      : Data.List.Stream
 -- Copyright   : (c) Duncan Coutts 2007
 --               (c) Don Stewart   2007
 -- License     : BSD-style
--- Maintainer  : dons@cse.unsw.edu.au
+-- Maintainer  : dons00@gmail.com
 -- Stability   : experimental
 -- Portability : portable
 --
diff --git a/Data/Stream.hs b/Data/Stream.hs
--- a/Data/Stream.hs
+++ b/Data/Stream.hs
@@ -1,11 +1,11 @@
-{-# OPTIONS_GHC -fdicts-cheap -fbang-patterns #-}
+{-# LANGUAGE BangPatterns #-}
 
 -- |
 -- Module      : Data.Stream
 -- Copyright   : (c) Duncan Coutts 2007
 --               (c) Don Stewart   2007
 -- License     : BSD-style
--- Maintainer  : dons@cse.unsw.edu.au
+-- Maintainer  : dons00@gmail.com
 -- Stability   : experimental
 -- Portability : portable, requires cpp
 -- Tested with : GHC 6.6
diff --git a/stream-fusion.cabal b/stream-fusion.cabal
--- a/stream-fusion.cabal
+++ b/stream-fusion.cabal
@@ -1,7 +1,7 @@
 Name:                stream-fusion
-Version:             0.1.2.2
+Version:             0.1.2.3
 Author:              Duncan Coutts, Don Stewart
-Maintainer:          duncan.coutts@worc.ox.ac.uk, dons@galois.com
+Maintainer:          duncan.coutts@worc.ox.ac.uk, dons00@gmail.com
 License:             BSD3
 License-file:        LICENSE
 Synopsis:            Faster Haskell lists using stream fusion
@@ -16,17 +16,16 @@
         and hide list functions from the Prelude.
 Category:            Data
 Build-Type:          Simple
-Build-Depends:       base < 10
+Build-Depends:       base >= 3 && < 5
 Stability:           experimental
-Tested-with:         GHC==6.8
+Tested-with:         GHC==7.0.3
 Exposed-modules:     Data.Stream
                      Data.List.Stream
                      Control.Monad.Stream
 Extensions:          CPP, BangPatterns, ExistentialQuantification
 cpp-options:         -DEXTERNAL_PACKAGE
 ghc-options:         -fglasgow-exts
-                     -O2
-                     -fvia-C -optc-O3
+                     -Odph
                      -fspec-constr
                      -funbox-strict-fields 
                      -fdicts-cheap
diff --git a/tests/Makefile b/tests/Makefile
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,5 +1,5 @@
 
-GHC_FLAGS=-cpp -DEXTERNAL_PACKAGE -i.. -O2 -fglasgow-exts -fbang-patterns
+GHC_FLAGS=-cpp -DEXTERNAL_PACKAGE -i.. -O2 -fglasgow-exts -fbang-patterns -package QuickCheck-1.2.0.1 
 #GHC_FLAGS="-hide-package arrows-0.2"
 GHC=ghc
 
@@ -10,19 +10,19 @@
 # testing
 
 list ::
-	runghc  $(GHC_FLAGS) Properties/ListVsSpec.hs
-	runghc  $(GHC_FLAGS) Properties/ListVsBase.hs
+	runhaskell  $(GHC_FLAGS) Properties/ListVsSpec.hs
+	runhaskell  $(GHC_FLAGS) Properties/ListVsBase.hs
 stream ::
-	runghc  $(GHC_FLAGS) Properties/StreamListVsSpec.hs
-	runghc  $(GHC_FLAGS) Properties/StreamListVsBase.hs
-	runghc  $(GHC_FLAGS) Properties/StreamVsSpecStream.hs
+	runhaskell  $(GHC_FLAGS) Properties/StreamListVsSpec.hs
+	runhaskell  $(GHC_FLAGS) Properties/StreamListVsBase.hs
+	runhaskell  $(GHC_FLAGS) Properties/StreamVsSpecStream.hs
 internal ::
-	runghc  $(GHC_FLAGS) Properties/Internal.hs
+	runhaskell  $(GHC_FLAGS) Properties/Internal.hs
 strictness ::
-	runghc  $(GHC_FLAGS) Strictness/ListVsSpec.hs
-	runghc  $(GHC_FLAGS) Strictness/ListVsBase.hs
-	runghc  $(GHC_FLAGS) Strictness/BaseVsSpec.hs
-	runghc  $(GHC_FLAGS) Strictness/StreamListVsList.hs
+	runhaskell  $(GHC_FLAGS) Strictness/ListVsSpec.hs
+	runhaskell  $(GHC_FLAGS) Strictness/ListVsBase.hs
+	runhaskell  $(GHC_FLAGS) Strictness/BaseVsSpec.hs
+	runhaskell  $(GHC_FLAGS) Strictness/StreamListVsList.hs
 
 list-compiled ::
 	ghc  $(GHC_FLAGS) --make -frules-off -o lp Properties/ListVsSpec.hs