diff --git a/Codec/Container/Ogg/Packet.hs b/Codec/Container/Ogg/Packet.hs
index b86a3f1..21a1ab5 100644
--- a/Codec/Container/Ogg/Packet.hs
+++ b/Codec/Container/Ogg/Packet.hs
@@ -27,7 +27,7 @@ import Codec.Container.Ogg.Timestamp
 import Data.List as List
 import Data.Map as Map
 import Data.Word (Word32)
-import qualified Data.ByteString.Lazy as L
+import qualified Data.ByteString.Lazy as L (take, length, append, drop, ByteString)
 import qualified Data.ByteString.Lazy.Char8 as C
 
 ------------------------------------------------------------
diff --git a/Codec/Container/Ogg/Serial.hs b/Codec/Container/Ogg/Serial.hs
index a1c92d6..94a5e15 100644
--- a/Codec/Container/Ogg/Serial.hs
+++ b/Codec/Container/Ogg/Serial.hs
@@ -1,4 +1,4 @@
---
+{-# LANGUAGE TypeSynonymInstances #-}
 -- Module      : Serial
 -- Copyright   : (c) Conrad Parker 2007
 -- License     : BSD-style
diff --git a/tools/hogg.hs b/tools/hogg.hs
index 12c4151..428dc54 100644
--- a/tools/hogg.hs
+++ b/tools/hogg.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -cpp #-}
+{-# LANGUAGE CPP, FlexibleInstances #-}
 module Main where
 
 import System.Exit
@@ -18,7 +18,7 @@ import System.Console.GetOpt
 
 import Text.Printf
 
-import qualified Data.ByteString.Lazy as L
+import qualified Data.ByteString.Lazy as L (ByteString, concat, hGetContents, hPut)
 import qualified Data.ByteString.Lazy.Char8 as C
 import Data.Char
 import Data.List hiding (sort)
@@ -93,7 +93,7 @@ breakLines n s
     (rSpill, rLine) = break isSpace (reverse line)
     line' = reverse rLine
     rest' = reverse rSpill ++ rest
-    
+
 
 ------------------------------------------------------------
 --  HOggTool datatype
@@ -449,7 +449,7 @@ dumpPackets = do
 
 countPacketsSub :: SubCommand
 countPacketsSub = SubCommand "packetcount" countPackets
-    "Testing" "Count packets of an Ogg file" 
+    "Testing" "Count packets of an Ogg file"
     ""
     [("Count packets of all bitstreams in file.ogg", "file.ogg"),
      ("Count packets from only the Theora bitstreams in file.ogv",
@@ -589,7 +589,7 @@ addSkel = do
     outputPerFile $ map s2 skels
   where
     ioAddSkeleton x = liftIO $ chainAddSkeleton x
-  
+
 ------------------------------------------------------------
 -- countrwPages (countrw)
 --
@@ -616,7 +616,7 @@ countrwPages = do
 
 countPagesSub :: SubCommand
 countPagesSub = SubCommand "pagecount" countPages
-    "Testing" "Count pages of an Ogg file" 
+    "Testing" "Count pages of an Ogg file"
     ""
     [("Count pages of all bitstreams in file.ogg", "file.ogg"),
      ("Count pages from only the Theora bitstream in file.ogv",
@@ -1035,7 +1035,7 @@ handleSubCommand [] = -- bracket (initTool []) finish loop0
   where
     -- finish = exitWith ExitSuccess
     loop0 st = runReaderT help st
-    
+
 handleSubCommand (command:args) = -- bracket (initTool args) finish loop1
   (initTool args) >>= loop1
   where