diff --git a/src/System/Plugins/Env.hs b/src/System/Plugins/Env.hs
index f63b318..7a4db5c 100644
--- a/src/System/Plugins/Env.hs
+++ b/src/System/Plugins/Env.hs
@@ -491,8 +491,8 @@ lookupPkg' p = withPkgEnvs env $ \fms -> go fms p
 #endif
                 -- If we're loading dynamic libs we need the cbits to appear before the
                 -- real packages.
-                settings <- initSysTools (Just libdir)
-                llvmConfig <- initLlvmConfig (Just libdir)
+                settings <- initSysTools (libdir)
+                llvmConfig <- initLlvmConfig (libdir)
                 dflags <- initDynFlags $ defaultDynFlags settings llvmConfig
                 libs <- mapM (findHSlib
 #if MIN_VERSION_ghc(7,8,0)
diff --git a/src/System/Plugins/Load.hs b/src/System/Plugins/Load.hs
index d138999..cade594 100644
--- a/src/System/Plugins/Load.hs
+++ b/src/System/Plugins/Load.hs
@@ -126,8 +126,8 @@ readBinIface' :: FilePath -> IO ModIface
 readBinIface' hi_path = do
     -- kludgy as hell
 #if MIN_VERSION_ghc(7,2,0)
-    mySettings <- initSysTools (Just libdir) -- how should we really set the top dir?
-    llvmConfig <- initLlvmConfig (Just libdir)
+    mySettings <- initSysTools (libdir) -- how should we really set the top dir?
+    llvmConfig <- initLlvmConfig (libdir)
     dflags <- initDynFlags (defaultDynFlags mySettings llvmConfig)
     e <- newHscEnv dflags
 #else
diff --git a/stack.yaml b/stack.yaml
index f0aad65..5cfce2a 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,7 +1,7 @@
 # For more information, see: https://github.com/commercialhaskell/stack/blob/master/doc/yaml_configuration.md
 
 # Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)
-resolver: lts-14.27
+resolver: lts-16.13
 
 # Local packages, usually specified by relative directory name
 packages:
diff --git a/stack.yaml.lock b/stack.yaml.lock
index e24dcac..3be9a4b 100644
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    size: 524996
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/27.yaml
-    sha256: 7ea31a280c56bf36ff591a7397cc384d0dff622e7f9e4225b47d8980f019a0f0
-  original: lts-14.27
+    size: 532381
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/13.yaml
+    sha256: 6ee17f7996e5bc75ae4406250841f1362ad4196418a4d90a0615ff4f26ac98df
+  original: lts-16.13