diff --git a/patterns.cabal b/patterns.cabal
--- a/patterns.cabal
+++ b/patterns.cabal
@@ -1,24 +1,23 @@
 Name:            patterns
-Version:         0.0.2
-Cabal-Version:   >= 1.8
+Version:         0.0.3
+Cabal-Version:   >= 1.14.0
 Copyright:       Copyright (c) Tobias Schoofs, 2011 - 2012
 License:         LGPL
 license-file:    license/lgpl-3.0.txt
 Author:          Tobias Schoofs
 Maintainer:      tobias dot schoofs at gmx dot net
 Category:        Network, Message-oriented Middleware, zeromq
-Homepage:        http://github.com/toschoo/mom/src/patterns
+Homepage:        http://github.com/toschoo/mom
 Build-Type:      Simple
 Synopsis:        Common patterns in message-oriented applications
 Description:
 
-  There are common patterns often reused 
-  - or, in fact, reimplemented,
-  in many distributed, message-oriented applications,
+  In distributed, message-oriented applications,
+  similar communication patterns are used over and over again,
   such as Server\/Client (a.k.a Request\/Response),
-         Publish\/Subscribe,
-         Pipline (a.k.a. Push\/Pull) and
-         Exclusive Pair (a.k.a. Peer-to-Peer).
+          Publish\/Subscribe,
+          Pipline (a.k.a. Push\/Pull) and
+          Exclusive Pair (a.k.a. Peer-to-Peer).
   The Patterns package implements those patterns based on zeromq.
 
   More information on zeromq can be found at
@@ -28,14 +27,16 @@
   on <http://github.com/toschoo/mom>.
 
 Library
-  Build-Depends:   base        >= 4.0 && <= 5.0,
-                   bytestring  >= 0.9.1.9,
-                   utf8-string >= 0.3.6,
-                   containers >= 0.3.0.0,
-                   zeromq-haskell >= 0.8.3,
-                   enumerator >= 0.4.11,
+  Build-Depends:   base        >= 4.5 && <= 5.0,
+                   bytestring  >= 0.9.2.1,
+                   utf8-string >= 0.3.7,
+                   containers >= 0.4.2.1,
+                   zeromq-haskell >= 0.8.4,
+                   enumerator >= 0.4.18,
                    mtl         >= 2.0.1.0,
-                   time        >= 1.1.4
+                   time        >= 1.4
+
+  default-language: Haskell98
 
   hs-source-dirs: src/Network/Mom, src
                    
diff --git a/src/Factory.hs b/src/Factory.hs
--- a/src/Factory.hs
+++ b/src/Factory.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS -fglasgow-exts -fno-cse #-}
 module Factory (
         mkUniqueId)
 where
diff --git a/src/Network/Mom/Patterns/Basic.hs b/src/Network/Mom/Patterns/Basic.hs
--- a/src/Network/Mom/Patterns/Basic.hs
+++ b/src/Network/Mom/Patterns/Basic.hs
@@ -212,8 +212,8 @@
                 (String  -> E.Iteratee c IO i) ->
                 Fetch i o                      -> 
                 (Service -> IO a)              -> IO a
-  withServer ctx name param n ac t iconv oconv onerr build fetch action =
-    withService ctx name param service action
+  withServer ctx name param n ac t iconv oconv onerr build fetch =
+    withService ctx name param service 
     where service = serve n ac t iconv oconv onerr 
                           build fetch
 
@@ -633,8 +633,8 @@
                      OnError_            ->
                      Fetch_ o            -> 
                      (Service -> IO a)   -> IO a
-  withPeriodicPub ctx name param period ac oconv onerr fetch action =
-    withService ctx name param service action
+  withPeriodicPub ctx name param period ac oconv onerr fetch =
+    withService ctx name param service 
     where service = publish period ac oconv onerr fetch
 
   ------------------------------------------------------------------------
@@ -728,8 +728,8 @@
              InBound i -> OnError_  ->
              Dump i                 -> 
              (Service -> IO a)      -> IO a
-  withSub ctx name param sub ac iconv onErr dump action =
-    withService ctx name param service action
+  withSub ctx name param sub ac iconv onErr dump =
+    withService ctx name param service 
     where service = subscribe sub ac iconv onErr dump
 
   subscribe :: [Topic]     -> 
@@ -893,8 +893,8 @@
                 OnError_            ->
                 Dump   i            -> 
                 (Service -> IO a)   -> IO a
-  withPuller ctx name param ac iconv onerr dump action =
-    withService ctx name param service action
+  withPuller ctx name param ac iconv onerr dump =
+    withService ctx name param service 
     where service = pull ac iconv onerr dump 
 
   pull :: AccessPoint          ->
diff --git a/src/Network/Mom/Patterns/Device.hs b/src/Network/Mom/Patterns/Device.hs
--- a/src/Network/Mom/Patterns/Device.hs
+++ b/src/Network/Mom/Patterns/Device.hs
@@ -89,8 +89,8 @@
                 (Parameter -> OnTimeout)         ->
                 (Parameter -> Transformer o)     ->
                 (Service -> IO a)                -> IO a
-  withDevice ctx name param tmo acs iconv oconv onerr ontmo trans action =
-    withService ctx name param service action
+  withDevice ctx name param tmo acs iconv oconv onerr ontmo trans =
+    withService ctx name param service 
     where service = device_ tmo acs iconv oconv onerr ontmo trans
 
   ------------------------------------------------------------------------