diff --git a/deps/elf-edit b/deps/elf-edit
index d6d2654..3ba7d71 160000
--- a/deps/elf-edit
+++ b/deps/elf-edit
@@ -1 +1 @@
-Subproject commit d6d26540ed50348a597720b0015357bde34d504d
+Subproject commit 3ba7d7148adc6029b0046229c4fecbb9ee048f9b
diff --git a/src/Flexdis86/OpTable.hs b/src/Flexdis86/OpTable.hs
index 6a47da3..f35a0dd 100644
--- a/src/Flexdis86/OpTable.hs
+++ b/src/Flexdis86/OpTable.hs
@@ -48,7 +48,8 @@ module Flexdis86.OpTable
 import qualified Control.DeepSeq as DS
 import qualified Control.Monad.Fail as MF
 import           Control.Lens
-import           Control.Monad.State
+import           Control.Monad (forM_, unless, when)
+import           Control.Monad.State (MonadState(..), execStateT, gets)
 import           Data.Bits ((.&.), (.|.), shiftR, shiftL)
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Char8 as BSC
diff --git a/utils/DumpInstr.hs b/utils/DumpInstr.hs
index 580a0ea..edff9b4 100644
--- a/utils/DumpInstr.hs
+++ b/utils/DumpInstr.hs
@@ -3,9 +3,10 @@
 
 module Main where
 
-import           Control.Monad.Except
+import           Control.Monad (when)
+import           Control.Monad.Except (MonadError(..), ExceptT, runExceptT)
 import qualified Control.Monad.Fail as Fail
-import           Control.Monad.State
+import           Control.Monad.State (MonadState(..), State, evalState)
 import qualified Data.ByteString as BS
 import           Numeric (readHex)
 import           System.Environment (getArgs)