diff --git a/GenI.cabal b/GenI.cabal
--- a/GenI.cabal
+++ b/GenI.cabal
@@ -1,5 +1,5 @@
 Name:           GenI
-Version:        0.16
+Version:        0.16.1
 License:        GPL
 License-file:   LICENSE
 Author:         Carlos Areces and Eric Kow
@@ -7,8 +7,8 @@
 build-type:     Custom
 Category:       Natural Language Processing
 Homepage:       http://trac.loria.fr/~geni
-Synopsis:       GenI, an FB-LTAG surface realiser
-Description:    GenI, a natural language generator (more precisely, an FB-LTAG surface realiser)
+Synopsis:       A natural language generator (specifically, an FB-LTAG surface realiser)
+Description:    A natural language generator (specifically, an FB-LTAG surface realiser)
 Maintainer:     eric.kow@loria.fr
 
 extra-source-files: EnableGUI.hs, NLP/GenI/SysGeni.lhs
@@ -30,9 +30,9 @@
  Extensions:     CPP, Rank2Types, OverlappingInstances, MultiParamTypeClasses
  Ghc-options:    -Wall
  if flag(splitBase)
-    Build-Depends: base >= 3, binary, wx, wxcore, haskell98, mtl, parsec,
+    Build-Depends: base >= 3, binary, wx, wxcore, mtl, parsec,
                    QuickCheck, HUnit, HaXml >=1.16, libGenI,
                    process > 1, directory > 1, containers >= 0.1
  else
-    Build-Depends: base < 3, binary, wx, wxcore, haskell98, mtl, parsec,
+    Build-Depends: base < 3, binary, wx, wxcore, mtl, parsec,
                    QuickCheck, HUnit, HaXml >=1.16, libGenI
diff --git a/MainGeni.lhs b/MainGeni.lhs
--- a/MainGeni.lhs
+++ b/MainGeni.lhs
@@ -29,7 +29,7 @@
 \ignore{
 \begin{code}
 import Data.IORef(newIORef)
-import System(getArgs)
+import System.Environment(getArgs)
 
 import NLP.GenI.Geni(emptyProgState)
 import NLP.GenI.Console(consoleGeni)
diff --git a/NLP/GenI/CkyEarley/CkyGui.lhs b/NLP/GenI/CkyEarley/CkyGui.lhs
--- a/NLP/GenI/CkyEarley/CkyGui.lhs
+++ b/NLP/GenI/CkyEarley/CkyGui.lhs
@@ -19,6 +19,7 @@
 
 \begin{code}
 {-# LANGUAGE FlexibleInstances, TypeSynonymInstances #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 module NLP.GenI.CkyEarley.CkyGui where
 \end{code}
 
diff --git a/NLP/GenI/GraphvizShow.lhs b/NLP/GenI/GraphvizShow.lhs
--- a/NLP/GenI/GraphvizShow.lhs
+++ b/NLP/GenI/GraphvizShow.lhs
@@ -20,7 +20,8 @@
 Outputting core GenI data to graphviz.
 
 \begin{code}
-{-# LANGUAGE FlexibleInstances, TypeSynonymInstances, FlexibleContexts #-} 
+{-# LANGUAGE FlexibleInstances, TypeSynonymInstances, FlexibleContexts #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 module NLP.GenI.GraphvizShow
 where
 \end{code}
diff --git a/NLP/GenI/GraphvizShowPolarity.lhs b/NLP/GenI/GraphvizShowPolarity.lhs
--- a/NLP/GenI/GraphvizShowPolarity.lhs
+++ b/NLP/GenI/GraphvizShowPolarity.lhs
@@ -16,7 +16,8 @@
 % Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 \begin{code}
-{-# LANGUAGE TypeSynonymInstances #-} 
+{-# LANGUAGE TypeSynonymInstances #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 module NLP.GenI.GraphvizShowPolarity
 where
 
diff --git a/NLP/GenI/Simple/SimpleGui.lhs b/NLP/GenI/Simple/SimpleGui.lhs
--- a/NLP/GenI/Simple/SimpleGui.lhs
+++ b/NLP/GenI/Simple/SimpleGui.lhs
@@ -18,6 +18,7 @@
 \chapter{Simple GUI}
 
 \begin{code}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
 module NLP.GenI.Simple.SimpleGui where
 \end{code}
 
diff --git a/NLP/GenI/SysGeni.lhs b/NLP/GenI/SysGeni.lhs
--- a/NLP/GenI/SysGeni.lhs
+++ b/NLP/GenI/SysGeni.lhs
@@ -32,12 +32,14 @@
 \begin{code}
 import qualified System.Process as S
 
+#ifdef darwin_TARGET_OS 
 import Data.List(isSuffixOf)
-import System.Exit (ExitCode)
-import System.IO (Handle)
-
 import NLP.GenI.General((///))
+#endif
 
+import System.IO (Handle)
+import System.Exit (ExitCode)
+
 #ifdef __GLASGOW_HASKELL__
 import Foreign
 import Foreign.C
@@ -59,11 +61,11 @@
 processes we want to run are in \texttt{../Resources/bin}.
 
 \begin{code}
-#ifdef darwin_TARGET_OS 
 runInteractiveProcess :: String -> [String]
                       -> Maybe FilePath
                       -> Maybe [(String, String)]
                       -> IO (Handle, Handle, Handle, S.ProcessHandle)
+#ifdef darwin_TARGET_OS 
 runInteractiveProcess cmd args x y = do
   dirname <- getProgDirName
   -- detect if we're in an .app bundle, i.e. if