diff --git a/.travis.yml b/.travis.yml
index 63275d71..f49455bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,16 @@ matrix:
       - STACK_YAML="stack.yaml"
     addons: {apt: {packages: [libgmp-dev]}}
 
+  - env:
+      - BUILD_KIND="stack"
+      - STACK_YAML="nightly.yaml"
+    addons: {apt: {packages: [libgmp-dev]}}
+
+  - env:
+      - BUILD_KIND="stack"
+      - STACK_YAML="lts-12.yaml"
+    addons: {apt: {packages: [libgmp-dev]}}
+
   - env:
       - BUILD_KIND="stack"
       - STACK_YAML="lts-11.yaml"
diff --git a/genvalidity-property/src/Test/Validity/Shrinking/Property.hs b/genvalidity-property/src/Test/Validity/Shrinking/Property.hs
index dec04edc..d9260624 100644
--- a/genvalidity-property/src/Test/Validity/Shrinking/Property.hs
+++ b/genvalidity-property/src/Test/Validity/Shrinking/Property.hs
@@ -187,9 +187,7 @@ doesNotShrinkToItself ::
     => Gen a
     -> (a -> [a])
     -> Property
-doesNotShrinkToItself gen s =
-    forAll (scale ((round :: Double -> Int) . log . fromIntegral . max 1) gen) $ \a ->
-        all (/= a) $ s a
+doesNotShrinkToItself gen s = forAll gen $ \a -> all (/= a) $ s a
 
 -- |
 --
@@ -201,5 +199,4 @@ doesNotShrinkToItselfWithLimit ::
     -> Int
     -> Property
 doesNotShrinkToItselfWithLimit gen s l =
-    forAll (scale ((round :: Double -> Int) . log . fromIntegral . max 1) gen) $ \a ->
-        all (/= a) $ take l $ s a
+    forAll gen $ \a -> all (/= a) $ take l $ s a
diff --git a/lts-11.yaml b/lts-11.yaml
index 2d354f65..3ed899e9 100644
--- a/lts-11.yaml
+++ b/lts-11.yaml
@@ -28,4 +28,4 @@ packages:
 - 'validity-unordered-containers'
 - 'validity-uuid'
 - 'validity-vector'
-resolver: lts-11.18
+resolver: lts-11.22
diff --git a/lts-12.yaml b/lts-12.yaml
index 61a39ed1..78ec76e3 100644
--- a/lts-12.yaml
+++ b/lts-12.yaml
@@ -28,4 +28,4 @@ packages:
 - 'validity-unordered-containers'
 - 'validity-uuid'
 - 'validity-vector'
-resolver: lts-12.2
+resolver: lts-12.11
diff --git a/nightly.yaml b/nightly.yaml
index cf5dee65..d3c70a23 100644
--- a/nightly.yaml
+++ b/nightly.yaml
@@ -28,8 +28,4 @@ packages:
 - 'validity-unordered-containers'
 - 'validity-uuid'
 - 'validity-vector'
-extra-deps:
-  - uuid-1.3.13
-  - entropy-0.3.8
-  - Cabal-2.0.1.1
-resolver: nightly-2018-07-26
+resolver: nightly-2018-10-03
diff --git a/stack.yaml b/stack.yaml
index 74b327d5..3e7f8dbc 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -29,7 +29,8 @@ packages:
 - 'validity-unordered-containers'
 - 'validity-uuid'
 - 'validity-vector'
-resolver: lts-11.14
+resolver: lts-12.11
 extra-deps:
 - hlint-2.0.15
 - extra-1.6.5
+- Cabal-2.0.1.1
diff --git a/zift.hs b/zift.hs
deleted file mode 100755
index df3c887c..00000000
--- a/zift.hs
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env stack
-{- stack
-    --install-ghc
-    runghc
-    --package zifter
-    --package zifter-git
-    --package zifter-hindent
-    --package zifter-hlint
-    --package zifter-stack
--}
-import Zifter
-import Zifter.Git
-import Zifter.Hindent
-import Zifter.Hlint
-import Zifter.Stack
-
-main :: IO ()
-main =
-    ziftWith $ do
-        recursiveZift
-        preprocessor $
-            hindentZiftExcept
-                [ "genvalidity-containers/src/Data/GenValidity/Map.hs"
-                , "genvalidity-containers/src/Data/GenValidity/Set.hs"
-                , "genvalidity-containers/test/Test/Validity/Containers/MapSpec.hs"
-                , "genvalidity-containers/test/Test/Validity/Containers/SetSpec.hs"
-                , "genvalidity-hspec/src/Test/Validity/Utils.hs"
-                , "genvalidity/src/Data/GenRelativeValidity.hs"
-                , "genvalidity/src/Data/GenValidity.hs"
-                , "validity-path/src/Data/Validity/Path.hs"
-                , "validity/src/Data/RelativeValidity.hs"
-                , "validity/src/Data/Validity.hs"
-                ]
-        prechecker gitAddAllZift
-        checker $ do
-            hlintZift
-            stackBuildZift