diff --git a/cabal.project.newbuild b/cabal.project.newbuild
index 21580f60..b356cf49 100644
--- a/cabal.project.newbuild
+++ b/cabal.project.newbuild
@@ -31,3 +31,9 @@ constraints:
   regex == 1.0.1.3
 allow-newer:
   regex:template-haskell
+
+-- TODO RGS: Remove this when on Hackage
+source-repository-package
+  type: git
+  location: https://github.com/GaloisInc/s-cargot-letbind
+  tag: a00bba1ffa27a605f4d2f9585bf7ea77e1c63726
diff --git a/semmc-learning/semmc-learning.cabal b/semmc-learning/semmc-learning.cabal
index ad9eed4c..12eb6a94 100644
--- a/semmc-learning/semmc-learning.cabal
+++ b/semmc-learning/semmc-learning.cabal
@@ -43,7 +43,7 @@ library
                        mtl,
                        containers,
                        stm,
-                       text >= 1 && < 2,
+                       text >= 1 && < 2.1,
                        time,
                        filepath,
                        bytestring >=0.10 && < 0.12,
diff --git a/semmc-ppc/src/SemMC/Architecture/PPC.hs b/semmc-ppc/src/SemMC/Architecture/PPC.hs
index d734ecae..6abf3be0 100644
--- a/semmc-ppc/src/SemMC/Architecture/PPC.hs
+++ b/semmc-ppc/src/SemMC/Architecture/PPC.hs
@@ -8,6 +8,7 @@
 {-# LANGUAGE TypeFamilyDependencies #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE TypeSynonymInstances #-}
+{-# LANGUAGE UndecidableSuperClasses #-}
 
 module SemMC.Architecture.PPC ( AnyPPC, Variant, V32, V64
                               , VariantRepr(..), KnownVariant(..)
diff --git a/semmc-toy/semmc-toy.cabal b/semmc-toy/semmc-toy.cabal
index 41f93e55..aa62aa50 100644
--- a/semmc-toy/semmc-toy.cabal
+++ b/semmc-toy/semmc-toy.cabal
@@ -25,7 +25,7 @@ library
                      , containers >= 0.5.8
                      , filepath
                      , located-base
-                     , text >= 1 && < 2
+                     , text >= 1 && < 2.1
                      , crucible >= 0.4
                      , crucible-llvm
                      , dismantle-tablegen
diff --git a/semmc/semmc.cabal b/semmc/semmc.cabal
index ab688647..08e93bea 100644
--- a/semmc/semmc.cabal
+++ b/semmc/semmc.cabal
@@ -70,7 +70,7 @@ library
                        stm,
                        BoundedChan,
                        located-base,
-                       text >= 1 && < 2,
+                       text >= 1 && < 2.1,
                        exceptions >= 0.8 && < 0.11,
                        s-cargot >= 0.1.4.0 && < 0.2,
                        s-cargot-letbind >= 0.2.2.0 && < 0.3,
diff --git a/semmc/src/SemMC/Architecture.hs b/semmc/src/SemMC/Architecture.hs
index 739a620e..cf3f3f25 100644
--- a/semmc/src/SemMC/Architecture.hs
+++ b/semmc/src/SemMC/Architecture.hs
@@ -12,6 +12,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE UndecidableSuperClasses #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeOperators #-}
diff --git a/semmc/src/SemMC/Architecture/Concrete.hs b/semmc/src/SemMC/Architecture/Concrete.hs
index 7ba21cdc..5b431946 100644
--- a/semmc/src/SemMC/Architecture/Concrete.hs
+++ b/semmc/src/SemMC/Architecture/Concrete.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE ExistentialQuantification #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE UndecidableSuperClasses #-}
 module SemMC.Architecture.Concrete (
   RegisterizedInstruction(..),
   LiteralRef(..),
diff --git a/semmc/src/SemMC/Architecture/Pseudo.hs b/semmc/src/SemMC/Architecture/Pseudo.hs
index 7c79998e..aba77f8d 100644
--- a/semmc/src/SemMC/Architecture/Pseudo.hs
+++ b/semmc/src/SemMC/Architecture/Pseudo.hs
@@ -13,6 +13,7 @@
 {-# LANGUAGE TypeInType #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
+{-# LANGUAGE UndecidableSuperClasses #-}
 -- | Support for "pseudo" archtiectures that wrap other architectures to provide
 -- extra operands beyond the native architecture
 --
diff --git a/submodules/asl-translator b/submodules/asl-translator
index 83e498bb..b1d3c6b8 160000
--- a/submodules/asl-translator
+++ b/submodules/asl-translator
@@ -1 +1 @@
-Subproject commit 83e498bb687b518784504da6db3e6c1b09f64db3
+Subproject commit b1d3c6b816ff90a12f31429f65f99866215ad1b1
diff --git a/submodules/crucible b/submodules/crucible
index f4145fbe..ad4a5534 160000
--- a/submodules/crucible
+++ b/submodules/crucible
@@ -1 +1 @@
-Subproject commit f4145fbed96245f385a91ef3a32e6737df1075ff
+Subproject commit ad4a553487eeb5c6bbb5abf4bde26af905bf0254
diff --git a/submodules/dismantle b/submodules/dismantle
index 48433e7c..82849d4a 160000
--- a/submodules/dismantle
+++ b/submodules/dismantle
@@ -1 +1 @@
-Subproject commit 48433e7ccb02924b2f4695c8c9f09fb9cfccdfc4
+Subproject commit 82849d4aa097e7e802953286339ef9ea5e0e4bf4