diff --git a/Network/Wai/Application/Classic/Header.hs b/Network/Wai/Application/Classic/Header.hs
--- a/Network/Wai/Application/Classic/Header.hs
+++ b/Network/Wai/Application/Classic/Header.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings, FlexibleContexts #-}
 
 module Network.Wai.Application.Classic.Header where
 
diff --git a/Network/Wai/Application/Classic/Range.hs b/Network/Wai/Application/Classic/Range.hs
--- a/Network/Wai/Application/Classic/Range.hs
+++ b/Network/Wai/Application/Classic/Range.hs
@@ -2,10 +2,11 @@
 
 module Network.Wai.Application.Classic.Range (skipAndSize) where
 
-import Control.Applicative hiding (optional)
+import Control.Applicative ((<|>), many, (<$>), (<$), (<*), (*>))
 import Data.Attoparsec.ByteString hiding (satisfy)
 import Data.Attoparsec.ByteString.Char8 hiding (take)
-import Data.ByteString.Char8 hiding (map, count, take, elem)
+import Data.ByteString.Char8 (ByteString)
+import qualified Data.ByteString.Char8 as B8
 import Network.HTTP.Types
 
 -- |
@@ -59,4 +60,4 @@
 spcs = () <$ many spc
 
 spc :: Parser Char
-spc = satisfy (`elem` " \t")
+spc = satisfy (`B8.elem` " \t")
diff --git a/test/ClassicSpec.hs b/test/ClassicSpec.hs
--- a/test/ClassicSpec.hs
+++ b/test/ClassicSpec.hs
@@ -71,7 +71,7 @@
                 hdr = rspHeaders rsp
                 Just lm = lookupHeader HdrLocation hdr
             sc `shouldBe` (3,0,1)
-            lm `shouldBe` "http://127.0.0.1:2345/redirect/"
+            lm `shouldBe` "//127.0.0.1:2345/redirect/"
 
 ----------------------------------------------------------------
 
diff --git a/wai-app-file-cgi.cabal b/wai-app-file-cgi.cabal
--- a/wai-app-file-cgi.cabal
+++ b/wai-app-file-cgi.cabal
@@ -1,5 +1,5 @@
 Name:                   wai-app-file-cgi
-Version:                3.0.4
+Version:                3.0.5
 Author:                 Kazu Yamamoto <kazu@iij.ad.jp>
 Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp>
 License:                BSD3