diff --git a/Network/Tremulous/Polling.hs b/Network/Tremulous/Polling.hs
--- a/Network/Tremulous/Polling.hs
+++ b/Network/Tremulous/Polling.hs
@@ -3,7 +3,7 @@
     , pollOne
 ) where
 import Prelude hiding (all, concat, mapM_, elem, sequence_, concatMap
-    , catch, Maybe(..), maybe, foldr)
+    , Maybe(..), maybe, foldr)
 import qualified Data.Maybe as P
 
 import Control.Monad (when)
diff --git a/Network/Tremulous/SocketExtensions.hs b/Network/Tremulous/SocketExtensions.hs
--- a/Network/Tremulous/SocketExtensions.hs
+++ b/Network/Tremulous/SocketExtensions.hs
@@ -1,11 +1,9 @@
-{-# LANGUAGE CPP, StandaloneDeriving #-}
+{-# LANGUAGE CPP #-}
 module Network.Tremulous.SocketExtensions where
 import Prelude as P
 import Foreign
 import Control.DeepSeq
 import Network.Socket
-
-deriving instance Ord SockAddr
 
 instance NFData SockAddr where
     rnf (SockAddrInet (PortNum a) b) = rnf a `seq` rnf b
diff --git a/tremulous-query.cabal b/tremulous-query.cabal
--- a/tremulous-query.cabal
+++ b/tremulous-query.cabal
@@ -1,5 +1,5 @@
 Name:                   tremulous-query
-Version:                1.0.6
+Version:                1.0.7
 Author:                 Christoffer Öjeling
 Maintainer:             Christoffer Öjeling <christoffer@ojeling.net>
 License:                GPL-3
@@ -12,7 +12,7 @@
 
 Cabal-Version:          >= 1.10
 Build-Type:             Simple
-Tested-With:            GHC==7.6.1
+Tested-With:            GHC==7.6.2
 
 Source-Repository head
   Type:                 git
@@ -25,7 +25,7 @@
                         RecordWildCards GADTs ScopedTypeVariables
                         OverloadedStrings DeriveDataTypeable
 
-  Other-Extensions:     CPP StandaloneDeriving
+  Other-Extensions:     CPP
 
   Exposed-Modules:      Network.Tremulous.Protocol
                         Network.Tremulous.Polling
@@ -38,7 +38,7 @@
                         Network.Tremulous.StrictMaybe
                         Network.Tremulous.TupleReader
 
-  Build-Depends:        base>=4.5 && < 5, network, containers,
+  Build-Depends:        base>=4.5 && < 5, network >= 2.4, containers,
                         bytestring, attoparsec>=0.9, mtl, deepseq
   if os(windows)
       Build-Depends:    Win32