diff --git a/.travis.yml b/.travis.yml
index 2088a62e..b6926f8a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.3.20190730
+# version: 0.5.20190908
 #
 language: c
 dist: xenial
@@ -32,26 +32,27 @@ matrix:
   include:
     - compiler: ghc-8.8.1
       addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
-      env: HEADHACKAGE=true
     - compiler: ghc-8.6.5
-      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}
+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
     - compiler: ghc-8.4.4
-      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}
+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
     - compiler: ghc-8.2.2
-      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}
+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
     - compiler: ghc-8.0.2
-      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}
+      addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
   allow_failures:
     - compiler: ghc-8.8.1
 before_install:
   - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
+  - WITHCOMPILER="-w $HC"
+  - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
   - HCPKG="$HC-pkg"
   - unset CC
   - CABAL=/opt/ghc/bin/cabal
   - CABALHOME=$HOME/.cabal
   - export PATH="$CABALHOME/bin:$PATH"
   - TOP=$(pwd)
-  - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
+  - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
   - echo $HCNUMVER
   - CABAL="$CABAL -vnormal+nowrap+markoutput"
   - set -o pipefail
@@ -78,7 +79,8 @@ install:
   - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
   - TEST=--enable-tests
   - BENCH=--enable-benchmarks
-  - HEADHACKAGE=${HEADHACKAGE-false}
+  - HEADHACKAGE=false
+  - if [ $HCNUMVER -ge 80800 ] ; then HEADHACKAGE=true ; fi
   - rm -f $CABALHOME/config
   - |
     echo "verbose: normal +nowrap +markoutput"          >> $CABALHOME/config
@@ -107,9 +109,10 @@ install:
     echo "              f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89" >> $CABALHOME/config
     echo "   key-threshold: 3"                                                            >> $CABALHOME/config
     fi
+  - GHCJOBS=-j2
   - |
-    echo "program-default-options" >> $CABALHOME/config
-    echo "  ghc-options: -j2"      >> $CABALHOME/config
+    echo "program-default-options"                >> $CABALHOME/config
+    echo "  ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
   - cat $CABALHOME/config
   - rm -fv cabal.project cabal.project.local cabal.project.freeze
   - travis_retry ${CABAL} v2-update -v
@@ -117,47 +120,59 @@ install:
   - rm -rf cabal.project cabal.project.local cabal.project.freeze
   - touch cabal.project
   - |
-    echo 'packages: "servant"' >> cabal.project
-    echo 'packages: "servant-client"' >> cabal.project
-    echo 'packages: "servant-client-core"' >> cabal.project
-    if [ $HCNUMVER -eq 80002 ]  ||  [ $HCNUMVER -eq 80202 ]  ||  [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "servant-http-streams"' >> cabal.project ; fi
-    echo 'packages: "servant-docs"' >> cabal.project
-    echo 'packages: "servant-foreign"' >> cabal.project
-    echo 'packages: "servant-server"' >> cabal.project
-    if [ $HCNUMVER -eq 80002 ]  ||  [ $HCNUMVER -eq 80202 ]  ||  [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/tutorial"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80002 ]  ||  [ $HCNUMVER -eq 80202 ]  ||  [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "servant-machines"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80002 ]  ||  [ $HCNUMVER -eq 80202 ]  ||  [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "servant-conduit"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80002 ]  ||  [ $HCNUMVER -eq 80202 ]  ||  [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "servant-pipes"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/basic-auth"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/curl-mock"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/basic-streaming"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/db-postgres-pool"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/db-sqlite-simple"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/file-upload"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/generic"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/https"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/pagination"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/testing"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/structuring-apis"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/using-custom-monad"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "doc/cookbook/using-free-client"' >> cabal.project ; fi
+    echo "packages: servant" >> cabal.project
+    echo "packages: servant-client" >> cabal.project
+    echo "packages: servant-client-core" >> cabal.project
+    echo "packages: servant-http-streams" >> cabal.project
+    echo "packages: servant-docs" >> cabal.project
+    echo "packages: servant-foreign" >> cabal.project
+    echo "packages: servant-server" >> cabal.project
+    echo "packages: doc/tutorial" >> cabal.project
+    echo "packages: servant-machines" >> cabal.project
+    echo "packages: servant-conduit" >> cabal.project
+    echo "packages: servant-pipes" >> cabal.project
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-auth" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/curl-mock" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/basic-streaming" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/db-postgres-pool" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/file-upload" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/generic" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/testing" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/structuring-apis" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/using-custom-monad" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: doc/cookbook/using-free-client" >> cabal.project ; fi
   - |
-    echo "constraints:  foundation >=0.0.14"               >> cabal.project
-    echo "constraints:  memory <0.14.12 || >0.14.12"       >> cabal.project
-    echo "allow-newer:  servant-quickcheck:servant"        >> cabal.project
-    echo "allow-newer:  servant-quickcheck:servant-client" >> cabal.project
-    echo "allow-newer:  servant-quickcheck:servant-server" >> cabal.project
-    echo "allow-newer:  servant-quickcheck:hspec"          >> cabal.project
-    echo "allow-newer:  servant-quickcheck:http-client"    >> cabal.project
-    echo "allow-newer:  servant-quickcheck:warp"           >> cabal.project
-    echo "allow-newer:  vault-0.3.1.2:hashable"            >> cabal.project
-    echo "allow-newer:  psqueues-0.2.7.1:hashable"         >> cabal.project
-    echo "allow-newer:  sqlite-simple-0.4.16.0:semigroups" >> cabal.project
-    echo "allow-newer:  direct-sqlite-2.3.24:semigroups"   >> cabal.project
-    echo "allow-newer:  io-streams-1.5.1.0:network"        >> cabal.project
-    echo "allow-newer:  openssl-streams-1.2.2.0:network"   >> cabal.project
-    echo "optimization: False"                             >> cabal.project
-  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-db-sqlite-simple|cookbook-file-upload|cookbook-generic|cookbook-https|cookbook-pagination|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
+    echo "constraints:  foundation >=0.0.14"                            >> cabal.project
+    echo "constraints:  memory <0.14.12 || >0.14.12"                    >> cabal.project
+    echo "constraints:  sqlite-simple < 0"                              >> cabal.project
+    echo "allow-newer:  servant-multipart:http-media"                   >> cabal.project
+    echo "allow-newer:  servant-multipart:lens"                         >> cabal.project
+    echo "allow-newer:  servant-js:base"                                >> cabal.project
+    echo "allow-newer:  servant-js:lens"                                >> cabal.project
+    echo "allow-newer:  servant-quickcheck:base"                        >> cabal.project
+    echo "allow-newer:  servant-quickcheck:hspec"                       >> cabal.project
+    echo "allow-newer:  servant-quickcheck:http-client"                 >> cabal.project
+    echo "allow-newer:  servant-quickcheck:http-media"                  >> cabal.project
+    echo "allow-newer:  servant-quickcheck:QuickCheck"                  >> cabal.project
+    echo "allow-newer:  servant-quickcheck:servant"                     >> cabal.project
+    echo "allow-newer:  servant-quickcheck:servant-client"              >> cabal.project
+    echo "allow-newer:  servant-quickcheck:servant-server"              >> cabal.project
+    echo "allow-newer:  servant-quickcheck:time"                        >> cabal.project
+    echo "allow-newer:  servant-quickcheck:warp"                        >> cabal.project
+    echo "allow-newer:  vault-0.3.1.2:hashable"                         >> cabal.project
+    echo "allow-newer:  psqueues-0.2.7.1:hashable"                      >> cabal.project
+    echo "allow-newer:  sqlite-simple-0.4.16.0:semigroups"              >> cabal.project
+    echo "allow-newer:  direct-sqlite-2.3.24:semigroups"                >> cabal.project
+    echo "allow-newer:  io-streams-1.5.1.0:network"                     >> cabal.project
+    echo "allow-newer:  io-streams:primitive"                           >> cabal.project
+    echo "allow-newer:  openssl-streams-1.2.2.0:network"                >> cabal.project
+    echo "optimization: False"                                          >> cabal.project
+    echo ""                                                             >> cabal.project
+    echo "source-repository-package"                                    >> cabal.project
+    echo "  type:     git"                                              >> cabal.project
+    echo "  location: https://github.com/luqui/control-monad-omega.git" >> cabal.project
+    echo "  tag:      76c71e8917eec275ba423959f00a34583b5c7215"         >> cabal.project
+  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
   - cat cabal.project || true
   - cat cabal.project.local || true
   - if [ -f "servant/configure.ac" ]; then (cd "servant" && autoreconf -i); fi
@@ -175,16 +190,13 @@ install:
   - if [ -f "doc/cookbook/curl-mock/configure.ac" ]; then (cd "doc/cookbook/curl-mock" && autoreconf -i); fi
   - if [ -f "doc/cookbook/basic-streaming/configure.ac" ]; then (cd "doc/cookbook/basic-streaming" && autoreconf -i); fi
   - if [ -f "doc/cookbook/db-postgres-pool/configure.ac" ]; then (cd "doc/cookbook/db-postgres-pool" && autoreconf -i); fi
-  - if [ -f "doc/cookbook/db-sqlite-simple/configure.ac" ]; then (cd "doc/cookbook/db-sqlite-simple" && autoreconf -i); fi
   - if [ -f "doc/cookbook/file-upload/configure.ac" ]; then (cd "doc/cookbook/file-upload" && autoreconf -i); fi
   - if [ -f "doc/cookbook/generic/configure.ac" ]; then (cd "doc/cookbook/generic" && autoreconf -i); fi
-  - if [ -f "doc/cookbook/https/configure.ac" ]; then (cd "doc/cookbook/https" && autoreconf -i); fi
-  - if [ -f "doc/cookbook/pagination/configure.ac" ]; then (cd "doc/cookbook/pagination" && autoreconf -i); fi
   - if [ -f "doc/cookbook/testing/configure.ac" ]; then (cd "doc/cookbook/testing" && autoreconf -i); fi
   - if [ -f "doc/cookbook/structuring-apis/configure.ac" ]; then (cd "doc/cookbook/structuring-apis" && autoreconf -i); fi
   - if [ -f "doc/cookbook/using-custom-monad/configure.ac" ]; then (cd "doc/cookbook/using-custom-monad" && autoreconf -i); fi
   - if [ -f "doc/cookbook/using-free-client/configure.ac" ]; then (cd "doc/cookbook/using-free-client" && autoreconf -i); fi
-  - ${CABAL} v2-freeze -w ${HC} ${TEST} ${BENCH} | color_cabal_output
+  - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
   - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
   - rm  cabal.project.freeze
 script:
@@ -197,75 +209,109 @@ script:
   - echo 'Unpacking...' && echo -en 'travis_fold:start:unpack\\r'
   - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
   - cd ${DISTDIR} || false
-  - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
+  - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;
+  - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm       '{}' \;
+  - PKGDIR_servant="$(find . -maxdepth 1 -type d -regex '.*/servant-[0-9.]*')"
+  - PKGDIR_servant_client="$(find . -maxdepth 1 -type d -regex '.*/servant-client-[0-9.]*')"
+  - PKGDIR_servant_client_core="$(find . -maxdepth 1 -type d -regex '.*/servant-client-core-[0-9.]*')"
+  - PKGDIR_servant_http_streams="$(find . -maxdepth 1 -type d -regex '.*/servant-http-streams-[0-9.]*')"
+  - PKGDIR_servant_docs="$(find . -maxdepth 1 -type d -regex '.*/servant-docs-[0-9.]*')"
+  - PKGDIR_servant_foreign="$(find . -maxdepth 1 -type d -regex '.*/servant-foreign-[0-9.]*')"
+  - PKGDIR_servant_server="$(find . -maxdepth 1 -type d -regex '.*/servant-server-[0-9.]*')"
+  - PKGDIR_tutorial="$(find . -maxdepth 1 -type d -regex '.*/tutorial-[0-9.]*')"
+  - PKGDIR_servant_machines="$(find . -maxdepth 1 -type d -regex '.*/servant-machines-[0-9.]*')"
+  - PKGDIR_servant_conduit="$(find . -maxdepth 1 -type d -regex '.*/servant-conduit-[0-9.]*')"
+  - PKGDIR_servant_pipes="$(find . -maxdepth 1 -type d -regex '.*/servant-pipes-[0-9.]*')"
+  - PKGDIR_cookbook_basic_auth="$(find . -maxdepth 1 -type d -regex '.*/cookbook-basic-auth-[0-9.]*')"
+  - PKGDIR_cookbook_curl_mock="$(find . -maxdepth 1 -type d -regex '.*/cookbook-curl-mock-[0-9.]*')"
+  - PKGDIR_cookbook_basic_streaming="$(find . -maxdepth 1 -type d -regex '.*/cookbook-basic-streaming-[0-9.]*')"
+  - PKGDIR_cookbook_db_postgres_pool="$(find . -maxdepth 1 -type d -regex '.*/cookbook-db-postgres-pool-[0-9.]*')"
+  - PKGDIR_cookbook_file_upload="$(find . -maxdepth 1 -type d -regex '.*/cookbook-file-upload-[0-9.]*')"
+  - PKGDIR_cookbook_generic="$(find . -maxdepth 1 -type d -regex '.*/cookbook-generic-[0-9.]*')"
+  - PKGDIR_cookbook_testing="$(find . -maxdepth 1 -type d -regex '.*/cookbook-testing-[0-9.]*')"
+  - PKGDIR_cookbook_structuring_apis="$(find . -maxdepth 1 -type d -regex '.*/cookbook-structuring-apis-[0-9.]*')"
+  - PKGDIR_cookbook_using_custom_monad="$(find . -maxdepth 1 -type d -regex '.*/cookbook-using-custom-monad-[0-9.]*')"
+  - PKGDIR_cookbook_using_free_client="$(find . -maxdepth 1 -type d -regex '.*/cookbook-using-free-client-[0-9.]*')"
   # Generate cabal.project
   - rm -rf cabal.project cabal.project.local cabal.project.freeze
   - touch cabal.project
   - |
-    echo 'packages: "servant-*/*.cabal"' >> cabal.project
-    echo 'packages: "servant-client-*/*.cabal"' >> cabal.project
-    echo 'packages: "servant-client-core-*/*.cabal"' >> cabal.project
-    if [ $HCNUMVER -eq 80002 ]  ||  [ $HCNUMVER -eq 80202 ]  ||  [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "servant-http-streams-*/*.cabal"' >> cabal.project ; fi
-    echo 'packages: "servant-docs-*/*.cabal"' >> cabal.project
-    echo 'packages: "servant-foreign-*/*.cabal"' >> cabal.project
-    echo 'packages: "servant-server-*/*.cabal"' >> cabal.project
-    if [ $HCNUMVER -eq 80002 ]  ||  [ $HCNUMVER -eq 80202 ]  ||  [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "tutorial-*/*.cabal"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80002 ]  ||  [ $HCNUMVER -eq 80202 ]  ||  [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "servant-machines-*/*.cabal"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80002 ]  ||  [ $HCNUMVER -eq 80202 ]  ||  [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "servant-conduit-*/*.cabal"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80002 ]  ||  [ $HCNUMVER -eq 80202 ]  ||  [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "servant-pipes-*/*.cabal"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-basic-auth-*/*.cabal"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-curl-mock-*/*.cabal"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-basic-streaming-*/*.cabal"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-db-postgres-pool-*/*.cabal"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-db-sqlite-simple-*/*.cabal"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-file-upload-*/*.cabal"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-generic-*/*.cabal"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-https-*/*.cabal"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-pagination-*/*.cabal"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-testing-*/*.cabal"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-structuring-apis-*/*.cabal"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-using-custom-monad-*/*.cabal"' >> cabal.project ; fi
-    if [ $HCNUMVER -eq 80404 ]  ||  [ $HCNUMVER -eq 80605 ] ; then echo 'packages: "cookbook-using-free-client-*/*.cabal"' >> cabal.project ; fi
+    echo "packages: ${PKGDIR_servant}" >> cabal.project
+    echo "packages: ${PKGDIR_servant_client}" >> cabal.project
+    echo "packages: ${PKGDIR_servant_client_core}" >> cabal.project
+    echo "packages: ${PKGDIR_servant_http_streams}" >> cabal.project
+    echo "packages: ${PKGDIR_servant_docs}" >> cabal.project
+    echo "packages: ${PKGDIR_servant_foreign}" >> cabal.project
+    echo "packages: ${PKGDIR_servant_server}" >> cabal.project
+    echo "packages: ${PKGDIR_tutorial}" >> cabal.project
+    echo "packages: ${PKGDIR_servant_machines}" >> cabal.project
+    echo "packages: ${PKGDIR_servant_conduit}" >> cabal.project
+    echo "packages: ${PKGDIR_servant_pipes}" >> cabal.project
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_auth}" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_curl_mock}" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_basic_streaming}" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_db_postgres_pool}" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_file_upload}" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_generic}" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_testing}" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_structuring_apis}" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_using_custom_monad}" >> cabal.project ; fi
+    if [ $HCNUMVER -ge 80400 ] ; then echo "packages: ${PKGDIR_cookbook_using_free_client}" >> cabal.project ; fi
   - |
-    echo "constraints:  foundation >=0.0.14"               >> cabal.project
-    echo "constraints:  memory <0.14.12 || >0.14.12"       >> cabal.project
-    echo "allow-newer:  servant-quickcheck:servant"        >> cabal.project
-    echo "allow-newer:  servant-quickcheck:servant-client" >> cabal.project
-    echo "allow-newer:  servant-quickcheck:servant-server" >> cabal.project
-    echo "allow-newer:  servant-quickcheck:hspec"          >> cabal.project
-    echo "allow-newer:  servant-quickcheck:http-client"    >> cabal.project
-    echo "allow-newer:  servant-quickcheck:warp"           >> cabal.project
-    echo "allow-newer:  vault-0.3.1.2:hashable"            >> cabal.project
-    echo "allow-newer:  psqueues-0.2.7.1:hashable"         >> cabal.project
-    echo "allow-newer:  sqlite-simple-0.4.16.0:semigroups" >> cabal.project
-    echo "allow-newer:  direct-sqlite-2.3.24:semigroups"   >> cabal.project
-    echo "allow-newer:  io-streams-1.5.1.0:network"        >> cabal.project
-    echo "allow-newer:  openssl-streams-1.2.2.0:network"   >> cabal.project
-    echo "optimization: False"                             >> cabal.project
-  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-db-sqlite-simple|cookbook-file-upload|cookbook-generic|cookbook-https|cookbook-pagination|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
+    echo "constraints:  foundation >=0.0.14"                            >> cabal.project
+    echo "constraints:  memory <0.14.12 || >0.14.12"                    >> cabal.project
+    echo "constraints:  sqlite-simple < 0"                              >> cabal.project
+    echo "allow-newer:  servant-multipart:http-media"                   >> cabal.project
+    echo "allow-newer:  servant-multipart:lens"                         >> cabal.project
+    echo "allow-newer:  servant-js:base"                                >> cabal.project
+    echo "allow-newer:  servant-js:lens"                                >> cabal.project
+    echo "allow-newer:  servant-quickcheck:base"                        >> cabal.project
+    echo "allow-newer:  servant-quickcheck:hspec"                       >> cabal.project
+    echo "allow-newer:  servant-quickcheck:http-client"                 >> cabal.project
+    echo "allow-newer:  servant-quickcheck:http-media"                  >> cabal.project
+    echo "allow-newer:  servant-quickcheck:QuickCheck"                  >> cabal.project
+    echo "allow-newer:  servant-quickcheck:servant"                     >> cabal.project
+    echo "allow-newer:  servant-quickcheck:servant-client"              >> cabal.project
+    echo "allow-newer:  servant-quickcheck:servant-server"              >> cabal.project
+    echo "allow-newer:  servant-quickcheck:time"                        >> cabal.project
+    echo "allow-newer:  servant-quickcheck:warp"                        >> cabal.project
+    echo "allow-newer:  vault-0.3.1.2:hashable"                         >> cabal.project
+    echo "allow-newer:  psqueues-0.2.7.1:hashable"                      >> cabal.project
+    echo "allow-newer:  sqlite-simple-0.4.16.0:semigroups"              >> cabal.project
+    echo "allow-newer:  direct-sqlite-2.3.24:semigroups"                >> cabal.project
+    echo "allow-newer:  io-streams-1.5.1.0:network"                     >> cabal.project
+    echo "allow-newer:  io-streams:primitive"                           >> cabal.project
+    echo "allow-newer:  openssl-streams-1.2.2.0:network"                >> cabal.project
+    echo "optimization: False"                                          >> cabal.project
+    echo ""                                                             >> cabal.project
+    echo "source-repository-package"                                    >> cabal.project
+    echo "  type:     git"                                              >> cabal.project
+    echo "  location: https://github.com/luqui/control-monad-omega.git" >> cabal.project
+    echo "  tag:      76c71e8917eec275ba423959f00a34583b5c7215"         >> cabal.project
+  - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(cookbook-basic-auth|cookbook-basic-streaming|cookbook-curl-mock|cookbook-db-postgres-pool|cookbook-file-upload|cookbook-generic|cookbook-structuring-apis|cookbook-testing|cookbook-using-custom-monad|cookbook-using-free-client|servant|servant-client|servant-client-core|servant-conduit|servant-docs|servant-foreign|servant-http-streams|servant-machines|servant-pipes|servant-server|tutorial)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
   - cat cabal.project || true
   - cat cabal.project.local || true
   - echo -en 'travis_fold:end:unpack\\r'
   # Building with tests and benchmarks...
   - echo 'Building with tests and benchmarks...' && echo -en 'travis_fold:start:build-everything\\r'
   # build & run tests, build benchmarks
-  - ${CABAL} v2-build -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
+  - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
   - echo -en 'travis_fold:end:build-everything\\r'
   # Testing...
-  - ${CABAL} v2-test -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
+  - ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
   # haddock...
   - echo 'haddock...' && echo -en 'travis_fold:start:haddock\\r'
-  - ${CABAL} v2-haddock -w ${HC} ${TEST} ${BENCH} all | color_cabal_output
+  - ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all | color_cabal_output
   - echo -en 'travis_fold:end:haddock\\r'
   # Constraint sets
   - rm -rf cabal.project.local
   # Constraint set http-media-0.8
   - echo 'Constraint set http-media-0.8' && echo -en 'travis_fold:start:constraint-sets-http-media-0.8\\r'
-  - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='http-media ==0.8.*' all | color_cabal_output
+  - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='http-media ==0.8.*' all | color_cabal_output
   - echo -en 'travis_fold:end:constraint-sets-http-media-0.8\\r'
   # Constraint set http-media-0.7
   - echo 'Constraint set http-media-0.7' && echo -en 'travis_fold:start:constraint-sets-http-media-0.7\\r'
-  - ${CABAL} v2-build -w ${HC} --disable-tests --disable-benchmarks --constraint='http-media ==0.7.*' all | color_cabal_output
+  - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='http-media ==0.7.*' all | color_cabal_output
   - echo -en 'travis_fold:end:constraint-sets-http-media-0.7\\r'
 
 # REGENDATA ["--config=cabal.haskell-ci","--output=.travis.yml","cabal.project"]
diff --git a/cabal.project b/cabal.project
index 5523c55f..f6a69ff2 100644
--- a/cabal.project
+++ b/cabal.project
@@ -18,13 +18,13 @@ packages:
   doc/cookbook/curl-mock
   doc/cookbook/basic-streaming
   doc/cookbook/db-postgres-pool
-  doc/cookbook/db-sqlite-simple
+--  doc/cookbook/db-sqlite-simple
   doc/cookbook/file-upload
   doc/cookbook/generic
   -- doc/cookbook/hoist-server-with-context
-  doc/cookbook/https
+--  doc/cookbook/https
   -- doc/cookbook/jwt-and-basic-auth/
-  doc/cookbook/pagination
+--  doc/cookbook/pagination
   -- doc/cookbook/sentry
   doc/cookbook/testing
   doc/cookbook/structuring-apis
@@ -40,6 +40,14 @@ constraints:
   foundation >=0.0.14,
   memory <0.14.12 || >0.14.12
 
+allow-newer:
+  servant-multipart:http-media,
+  servant-multipart:lens
+
+allow-newer:
+  servant-js:base,
+  servant-js:lens
+
 allow-newer:
 --   servant-pagination:servant, servant-pagination:servant-server,
 --   servant-multipart:servant, servant-multipart:servant-server,
@@ -48,11 +56,15 @@ allow-newer:
 
 -- servant-quickcheck
 allow-newer:
+  servant-quickcheck:base,
+  servant-quickcheck:hspec,
+  servant-quickcheck:http-client,
+  servant-quickcheck:http-media,
+  servant-quickcheck:QuickCheck,
   servant-quickcheck:servant,
   servant-quickcheck:servant-client,
   servant-quickcheck:servant-server,
-  servant-quickcheck:hspec,
-  servant-quickcheck:http-client,
+  servant-quickcheck:time,
   servant-quickcheck:warp
 
 -- constraints: semigroups ^>=0.19
@@ -66,4 +78,14 @@ allow-newer: psqueues-0.2.7.1:hashable
 allow-newer: sqlite-simple-0.4.16.0:semigroups
 allow-newer: direct-sqlite-2.3.24:semigroups
 allow-newer: io-streams-1.5.1.0:network
+allow-newer: io-streams:primitive
 allow-newer: openssl-streams-1.2.2.0:network
+
+source-repository-package
+  type:     git
+  location: https://github.com/luqui/control-monad-omega.git
+  tag:      76c71e8917eec275ba423959f00a34583b5c7215
+
+-- MonadFail
+-- https://github.com/nurpax/sqlite-simple/issues/74
+constraints: sqlite-simple < 0
diff --git a/doc/cookbook/basic-auth/basic-auth.cabal b/doc/cookbook/basic-auth/basic-auth.cabal
index ef470aa1..c7112e2f 100644
--- a/doc/cookbook/basic-auth/basic-auth.cabal
+++ b/doc/cookbook/basic-auth/basic-auth.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.5
+tested-with:         GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
 
 executable cookbook-basic-auth
   main-is:             BasicAuth.lhs
diff --git a/doc/cookbook/basic-streaming/basic-streaming.cabal b/doc/cookbook/basic-streaming/basic-streaming.cabal
index e1551d87..07329d7a 100644
--- a/doc/cookbook/basic-streaming/basic-streaming.cabal
+++ b/doc/cookbook/basic-streaming/basic-streaming.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.5
+tested-with:         GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
 
 executable cookbook-basic-streaming
   main-is:             Streaming.lhs
@@ -17,7 +17,7 @@ executable cookbook-basic-streaming
   ghc-options:         -Wall -pgmL markdown-unlit -threaded -rtsopts
 
   hs-source-dirs: .
-  build-depends:       base >= 4.8 && <4.13
+  build-depends:       base >= 4.8 && <5
                      , aeson
                      , bytestring
                      , servant
diff --git a/doc/cookbook/curl-mock/curl-mock.cabal b/doc/cookbook/curl-mock/curl-mock.cabal
index 90acea7d..0b2a221a 100644
--- a/doc/cookbook/curl-mock/curl-mock.cabal
+++ b/doc/cookbook/curl-mock/curl-mock.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.5
+tested-with:         GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
 
 executable cookbock-curl-mock
   main-is:             CurlMock.lhs
diff --git a/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal b/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal
index 3366bbd5..10719272 100644
--- a/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal
+++ b/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.5
+tested-with:         GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
 
 executable cookbook-db-postgres-pool
   main-is:             PostgresPool.lhs
diff --git a/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal b/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal
index 74f7271f..9f4e2004 100644
--- a/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal
+++ b/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.5
+tested-with:         GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
 
 executable cookbook-db-sqlite-simple
   main-is:             DBConnection.lhs
diff --git a/doc/cookbook/file-upload/file-upload.cabal b/doc/cookbook/file-upload/file-upload.cabal
index 46e3a567..e97773d3 100644
--- a/doc/cookbook/file-upload/file-upload.cabal
+++ b/doc/cookbook/file-upload/file-upload.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.5
+tested-with:         GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
 
 executable cookbook-file-upload
   main-is:             FileUpload.lhs
diff --git a/doc/cookbook/generic/generic.cabal b/doc/cookbook/generic/generic.cabal
index a34e8a13..a5908beb 100644
--- a/doc/cookbook/generic/generic.cabal
+++ b/doc/cookbook/generic/generic.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.5
+tested-with:         GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
 
 executable cookbook-using-custom-monad
   main-is:             Generic.lhs
diff --git a/doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal b/doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal
index 21b19056..66407a45 100644
--- a/doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal
+++ b/doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal
@@ -11,7 +11,7 @@ maintainer:          haskell-servant-maintainers@googlegroups.com
 category:            Servant
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.5
+tested-with:         GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
 
 executable cookbook-hoist-server-with-context
   main-is:             HoistServerWithContext.lhs
diff --git a/doc/cookbook/https/https.cabal b/doc/cookbook/https/https.cabal
index 2a9356e8..b0d793b6 100644
--- a/doc/cookbook/https/https.cabal
+++ b/doc/cookbook/https/https.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.5
+tested-with:         GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
 
 executable cookbook-https
   main-is:             Https.lhs
diff --git a/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal b/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal
index 7063eb4f..fd5cdbdf 100644
--- a/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal
+++ b/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal
@@ -11,7 +11,7 @@ maintainer:          haskell-servant-maintainers@googlegroups.com
 category:            Servant
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.5
+tested-with:         GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
 
 executable cookbook-jwt-and-basic-auth
   main-is:             JWTAndBasicAuth.lhs
diff --git a/doc/cookbook/pagination/pagination.cabal b/doc/cookbook/pagination/pagination.cabal
index ff479645..3ad17ae2 100644
--- a/doc/cookbook/pagination/pagination.cabal
+++ b/doc/cookbook/pagination/pagination.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.5
+tested-with:         GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
 
 executable cookbook-pagination
   main-is:             Pagination.lhs
diff --git a/doc/cookbook/sentry/sentry.cabal b/doc/cookbook/sentry/sentry.cabal
index 21cd1d16..30b31cd5 100644
--- a/doc/cookbook/sentry/sentry.cabal
+++ b/doc/cookbook/sentry/sentry.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.5
+tested-with:         GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
 
 executable cookbook-sentry
   main-is:             Sentry.lhs
diff --git a/doc/cookbook/structuring-apis/structuring-apis.cabal b/doc/cookbook/structuring-apis/structuring-apis.cabal
index 88110ef0..f6fb631c 100644
--- a/doc/cookbook/structuring-apis/structuring-apis.cabal
+++ b/doc/cookbook/structuring-apis/structuring-apis.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.5
+tested-with:         GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
 
 executable cookbook-structuring-apis
   main-is:             StructuringApis.lhs
diff --git a/doc/cookbook/testing/testing.cabal b/doc/cookbook/testing/testing.cabal
index cbee0e73..28ed9691 100644
--- a/doc/cookbook/testing/testing.cabal
+++ b/doc/cookbook/testing/testing.cabal
@@ -10,7 +10,7 @@ maintainer:          haskell-servant-maintainers@googlegroups.com
 category:            Servant
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.5
+tested-with:         GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
 
 executable cookbook-testing
   main-is:             Testing.lhs
diff --git a/doc/cookbook/using-custom-monad/using-custom-monad.cabal b/doc/cookbook/using-custom-monad/using-custom-monad.cabal
index f20b1f4d..701d5116 100644
--- a/doc/cookbook/using-custom-monad/using-custom-monad.cabal
+++ b/doc/cookbook/using-custom-monad/using-custom-monad.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.5
+tested-with:         GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
 
 executable cookbook-using-custom-monad
   main-is:             UsingCustomMonad.lhs
diff --git a/doc/cookbook/using-free-client/using-free-client.cabal b/doc/cookbook/using-free-client/using-free-client.cabal
index 0ee104c7..d50bd419 100644
--- a/doc/cookbook/using-free-client/using-free-client.cabal
+++ b/doc/cookbook/using-free-client/using-free-client.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.5
+tested-with:         GHC==8.4.4, GHC==8.6.5, GHC==8.8.1
 
 executable cookbook-using-free-client
   main-is:             UsingFreeClient.lhs
diff --git a/doc/tutorial/tutorial.cabal b/doc/tutorial/tutorial.cabal
index 06b76129..d68dad30 100644
--- a/doc/tutorial/tutorial.cabal
+++ b/doc/tutorial/tutorial.cabal
@@ -17,6 +17,7 @@ tested-with:
   GHC==8.2.2
   GHC==8.4.4
   GHC==8.6.5
+  GHC==8.8.1
 extra-source-files:
   static/index.html
   static/ui.js
@@ -34,7 +35,7 @@ library
   -- Packages `servant` depends on.
   -- We don't need to specify bounds here as this package is never released.
   build-depends:
-      base >= 4.7 && <4.13
+      base >= 4.7 && <5
     , aeson
     , attoparsec
     , base-compat
@@ -69,7 +70,7 @@ library
     , lucid        >= 2.9.11  && < 2.10
     , random       >= 1.1     && < 1.2
     , servant-js   >= 0.9     && < 0.10
-    , time         >= 1.6.0.1 && < 1.9
+    , time         >= 1.6.0.1 && < 1.10
 
   -- For legacy tools, we need to specify build-depends too
   build-depends: markdown-unlit >= 0.5.0 && <0.6
diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal
index 6aa33851..52797b9d 100644
--- a/servant-client-core/servant-client-core.cabal
+++ b/servant-client-core/servant-client-core.cabal
@@ -55,13 +55,13 @@ library
   --
   -- note: mtl lower bound is so low because of GHC-7.8
   build-depends:
-      base                  >= 4.9      && < 4.13
+      base                  >= 4.9      && < 4.14
     , bytestring            >= 0.10.8.1 && < 0.11
     , containers            >= 0.5.7.1  && < 0.7
     , deepseq               >= 1.4.2.0  && < 1.5
     , text                  >= 1.2.3.0  && < 1.3
     , transformers          >= 0.5.2.0  && < 0.6
-    , template-haskell      >= 2.11.1.0 && < 2.15
+    , template-haskell      >= 2.11.1.0 && < 2.16
 
   if !impl(ghc >= 8.2)
     build-depends:
@@ -75,7 +75,7 @@ library
   -- Here can be exceptions if we really need features from the newer versions.
   build-depends:
       aeson                 >= 1.4.1.0  && < 1.5
-    , base-compat           >= 0.10.5   && < 0.11
+    , base-compat           >= 0.10.5   && < 0.12
     , base64-bytestring     >= 1.0.0.1  && < 1.1
     , exceptions            >= 0.10.0   && < 0.11
     , free                  >= 5.1      && < 5.2
diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal
index 826a8469..411880b9 100644
--- a/servant-client/servant-client.cabal
+++ b/servant-client/servant-client.cabal
@@ -46,14 +46,14 @@ library
   -- Bundled with GHC: Lower bound to not force re-installs
   -- text and mtl are bundled starting with GHC-8.4
   build-depends:
-      base                  >= 4.9      && < 4.13
+      base                  >= 4.9      && < 4.14
     , bytestring            >= 0.10.8.1 && < 0.11
     , containers            >= 0.5.7.1  && < 0.7
     , deepseq               >= 1.4.2.0  && < 1.5
     , mtl                   >= 2.2.2    && < 2.3
     , stm                   >= 2.4.5.1  && < 2.6
     , text                  >= 1.2.3.0  && < 1.3
-    , time                  >= 1.6.0.1  && < 1.9
+    , time                  >= 1.6.0.1  && < 1.10
     , transformers          >= 0.5.2.0  && < 0.6
 
   if !impl(ghc >= 8.2)
@@ -69,7 +69,7 @@ library
   -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
   -- Here can be exceptions if we really need features from the newer versions.
   build-depends:
-      base-compat           >= 0.10.5   && < 0.11
+      base-compat           >= 0.10.5   && < 0.12
     , http-client           >= 0.5.13.1 && < 0.7
     , http-media            >= 0.7.1.3  && < 0.9
     , http-types            >= 0.12.2   && < 0.13
diff --git a/servant-conduit/servant-conduit.cabal b/servant-conduit/servant-conduit.cabal
index f43109a4..4aec51d8 100644
--- a/servant-conduit/servant-conduit.cabal
+++ b/servant-conduit/servant-conduit.cabal
@@ -22,6 +22,7 @@ tested-with:
    || ==8.2.2
    || ==8.4.4
    || ==8.6.5
+   || ==8.8.1
 
 extra-source-files:
   CHANGELOG.md
diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal
index ef3430a2..282354f9 100644
--- a/servant-docs/servant-docs.cabal
+++ b/servant-docs/servant-docs.cabal
@@ -47,7 +47,7 @@ library
   --
   -- note: mtl lower bound is so low because of GHC-7.8
   build-depends:
-      base       >= 4.9      && < 4.13
+      base       >= 4.9      && < 4.14
     , bytestring >= 0.10.8.1 && < 0.11
     , text       >= 1.2.3.0  && < 1.3
 
@@ -60,13 +60,13 @@ library
   build-depends:
       aeson                >= 1.4.1.0  && < 1.5
     , aeson-pretty         >= 0.8.5    && < 0.9
-    , base-compat          >= 0.10.5   && < 0.11
+    , base-compat          >= 0.10.5   && < 0.12
     , case-insensitive     >= 1.2.0.11 && < 1.3
     , control-monad-omega  >= 0.3.1    && < 0.4
     , hashable             >= 1.2.7.0  && < 1.4
     , http-media           >= 0.7.1.3  && < 0.9
     , http-types           >= 0.12.2   && < 0.13
-    , lens                 >= 4.17     && < 4.18
+    , lens                 >= 4.17     && < 4.19
     , string-conversions   >= 0.4.0.1  && < 0.5
     , unordered-containers >= 0.2.9.0  && < 0.3
 
diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal
index 74fca054..1d85c132 100644
--- a/servant-foreign/servant-foreign.cabal
+++ b/servant-foreign/servant-foreign.cabal
@@ -47,7 +47,7 @@ library
   --
   -- note: mtl lower bound is so low because of GHC-7.8
   build-depends:
-      base        >= 4.9     && < 4.13
+      base        >= 4.9     && < 4.14
     , text        >= 1.2.3.0 && < 1.3
 
   -- Servant dependencies
@@ -57,8 +57,8 @@ library
   -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
   -- Here can be exceptions if we really need features from the newer versions.
   build-depends:
-      base-compat >= 0.10.5  && < 0.11
-    , lens        >= 4.17    && < 4.18
+      base-compat >= 0.10.5  && < 0.12
+    , lens        >= 4.17    && < 4.19
     , http-types  >= 0.12.2  && < 0.13
 
   hs-source-dirs:      src
diff --git a/servant-http-streams/servant-http-streams.cabal b/servant-http-streams/servant-http-streams.cabal
index 7c89c4c0..fa0ef1ed 100644
--- a/servant-http-streams/servant-http-streams.cabal
+++ b/servant-http-streams/servant-http-streams.cabal
@@ -26,6 +26,7 @@ tested-with:
    || ==8.2.2
    || ==8.4.4
    || ==8.6.5
+   || ==8.8.1
 
 extra-source-files:
   CHANGELOG.md
@@ -43,13 +44,13 @@ library
   -- Bundled with GHC: Lower bound to not force re-installs
   -- text and mtl are bundled starting with GHC-8.4
   build-depends:
-      base                  >= 4.9      && < 4.13
+      base                  >= 4.9      && < 4.14
     , bytestring            >= 0.10.8.1 && < 0.11
     , containers            >= 0.5.7.1  && < 0.7
     , deepseq               >= 1.4.2.0  && < 1.5
     , mtl                   >= 2.2.2    && < 2.3
     , text                  >= 1.2.3.0  && < 1.3
-    , time                  >= 1.6.0.1  && < 1.9
+    , time                  >= 1.6.0.1  && < 1.10
     , transformers          >= 0.5.2.0  && < 0.6
 
   if !impl(ghc >= 8.2)
@@ -65,7 +66,7 @@ library
   -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
   -- Here can be exceptions if we really need features from the newer versions.
   build-depends:
-      base-compat           >= 0.10.5   && < 0.11
+      base-compat           >= 0.10.5   && < 0.12
     , case-insensitive
     , http-streams          >= 0.8.6.1  && < 0.9
     , http-media            >= 0.7.1.3  && < 0.9
diff --git a/servant-machines/servant-machines.cabal b/servant-machines/servant-machines.cabal
index f08cf295..5a1343fc 100644
--- a/servant-machines/servant-machines.cabal
+++ b/servant-machines/servant-machines.cabal
@@ -22,6 +22,7 @@ tested-with:
    || ==8.2.2
    || ==8.4.4
    || ==8.6.5
+   || ==8.8.1
 
 extra-source-files:
   CHANGELOG.md
diff --git a/servant-pipes/servant-pipes.cabal b/servant-pipes/servant-pipes.cabal
index 9956a7fb..377346f6 100644
--- a/servant-pipes/servant-pipes.cabal
+++ b/servant-pipes/servant-pipes.cabal
@@ -22,6 +22,7 @@ tested-with:
    || ==8.2.2
    || ==8.4.4
    || ==8.6.5
+   || ==8.8.1
 
 extra-source-files:
   CHANGELOG.md
diff --git a/servant-pipes/src/Servant/Pipes.hs b/servant-pipes/src/Servant/Pipes.hs
index 52f70b25..d3dad447 100644
--- a/servant-pipes/src/Servant/Pipes.hs
+++ b/servant-pipes/src/Servant/Pipes.hs
@@ -65,7 +65,7 @@ instance (MonadIO m, a' ~ X, a ~ (), b' ~ (), r ~ ())
     fromSourceIO src = M $ liftIO $ S.unSourceT src (return . go) where
         go :: S.StepT IO b -> Proxy X () () b m ()
         go S.Stop        = Pure ()
-        go (S.Error err) = M (fail err)
+        go (S.Error err) = M (liftIO (fail err))
         go (S.Skip s)    = go s -- drives
         go (S.Effect ms) = M (liftIO (fmap go ms))
         go (S.Yield x s) = Respond x (const (go s))
diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal
index 60e160cb..5621eeeb 100644
--- a/servant-server/servant-server.cabal
+++ b/servant-server/servant-server.cabal
@@ -69,7 +69,7 @@ library
   -- Bundled with GHC: Lower bound to not force re-installs
   -- text and mtl are bundled starting with GHC-8.4
   build-depends:
-      base                >= 4.9      && < 4.13
+      base                >= 4.9      && < 4.14
     , bytestring          >= 0.10.8.1 && < 0.11
     , containers          >= 0.5.7.1  && < 0.7
     , mtl                 >= 2.2.2    && < 2.3
@@ -86,7 +86,7 @@ library
   -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
   -- Here can be exceptions if we really need features from the newer versions.
   build-depends:
-      base-compat         >= 0.10.5   && < 0.11
+      base-compat         >= 0.10.5   && < 0.12
     , base64-bytestring   >= 1.0.0.1  && < 1.1
     , exceptions          >= 0.10.0   && < 0.11
     , http-media          >= 0.7.1.3  && < 0.9
diff --git a/servant/servant.cabal b/servant/servant.cabal
index 3eb32ef5..f2798b60 100644
--- a/servant/servant.cabal
+++ b/servant/servant.cabal
@@ -89,7 +89,7 @@ library
   --
   -- note: mtl lower bound is so low because of GHC-7.8
   build-depends:
-      base                   >= 4.9      && < 4.13
+      base                   >= 4.9      && < 4.14
     , bytestring             >= 0.10.8.1 && < 0.11
     , mtl                    >= 2.2.2    && < 2.3
     , transformers           >= 0.5.2.0  && < 0.6
@@ -105,7 +105,7 @@ library
   -- Other dependencies: Lower bound around what is in the latest Stackage LTS.
   -- Here can be exceptions if we really need features from the newer versions.
   build-depends:
-      base-compat            >= 0.10.5   && < 0.11
+      base-compat            >= 0.10.5   && < 0.12
     , aeson                  >= 1.4.1.0  && < 1.5
     , attoparsec             >= 0.13.2.2 && < 0.14
     , bifunctors             >= 5.5.3    && < 5.6