diff --git a/Clckwrks/Page/Admin/PreviewPage.hs b/Clckwrks/Page/Admin/PreviewPage.hs
--- a/Clckwrks/Page/Admin/PreviewPage.hs
+++ b/Clckwrks/Page/Admin/PreviewPage.hs
@@ -30,7 +30,7 @@
                     (Just uid) -> query $ HasRole uid (Set.singleton Administrator)
               if authorized
                  then do cs <- get
-                         (Just page) <- query (PageById pid)
+                         ~(Just page) <- query (PageById pid)
                          let ttl = pageTitle page
                          bdy <- markupToContent (pageSrc page)
                          addHeaderM "X-XSS-Protection" "0"
diff --git a/Clckwrks/Page/Monad.hs b/Clckwrks/Page/Monad.hs
--- a/Clckwrks/Page/Monad.hs
+++ b/Clckwrks/Page/Monad.hs
@@ -67,7 +67,7 @@
           -> PageT m a
 clckT2PageT m =
     do p <- plugins <$> get
-       (Just clckShowFn) <- getPluginRouteFn p (pluginName clckPlugin)
+       ~(Just clckShowFn) <- getPluginRouteFn p (pluginName clckPlugin)
        flattenURLClckT clckShowFn $ mapClckT addReaderT m
     where
       addReaderT :: (Monad m) => m (a, ClckState) -> ReaderT PageConfig m (a, ClckState)
@@ -116,7 +116,7 @@
 markupToContent Markup{..} =
     do clckState <- get
        transformers <- getPreProcessors (plugins clckState)
-       (Just clckRouteFn) <- getPluginRouteFn (plugins clckState) (pluginName clckPlugin)
+       ~(Just clckRouteFn) <- getPluginRouteFn (plugins clckState) (pluginName clckPlugin)
        (markup', clckState') <- runClckT clckRouteFn clckState (foldM (\txt pp -> pp txt) (TL.fromStrict markup) transformers)
        put clckState'
        e <- liftIO $ runPreProcessors preProcessors trust (TL.toStrict markup')
diff --git a/Clckwrks/Page/Plugin.hs b/Clckwrks/Page/Plugin.hs
--- a/Clckwrks/Page/Plugin.hs
+++ b/Clckwrks/Page/Plugin.hs
@@ -46,8 +46,8 @@
 pageInit :: ClckPlugins
          -> IO (Maybe Text)
 pageInit plugins =
-    do (Just pageShowFn) <- getPluginRouteFn plugins (pluginName pagePlugin)
-       (Just clckShowFn) <- getPluginRouteFn plugins (pluginName clckPlugin)
+    do ~(Just pageShowFn) <- getPluginRouteFn plugins (pluginName pagePlugin)
+       ~(Just clckShowFn) <- getPluginRouteFn plugins (pluginName clckPlugin)
        mTopDir <- clckTopDir <$> getConfig plugins
        let basePath = maybe "_state" (\td -> td </> "_state") mTopDir -- FIXME
            pageDir  = maybe "_page" (\td -> td </> "_page") mTopDir
@@ -72,7 +72,7 @@
 addPageAdminMenu :: ClckT url IO ()
 addPageAdminMenu =
     do p <- plugins <$> get
-       (Just pageShowURL) <- getPluginRouteFn p (pluginName pagePlugin)
+       ~(Just pageShowURL) <- getPluginRouteFn p (pluginName pagePlugin)
        let newPageURL    = pageShowURL (PageAdmin NewPage) []
            pagesURL      = pageShowURL (PageAdmin Pages) []
            feedConfigURL = pageShowURL (PageAdmin EditFeedConfig) []
diff --git a/Clckwrks/Page/Route.hs b/Clckwrks/Page/Route.hs
--- a/Clckwrks/Page/Route.hs
+++ b/Clckwrks/Page/Route.hs
@@ -70,7 +70,7 @@
            do published <- query (IsPublishedPage pid)
               if published
                  then do cs <- get
-                         (Just page) <- query (PageById pid)
+                         ~(Just page) <- query (PageById pid)
                          let ttl = pageTitle page
                          bdy <- markupToContent (pageSrc page)
                          clckT2PageT $ themeTemplate (plugins cs) (pageThemeStyleId page) ttl () bdy
diff --git a/clckwrks-plugin-page.cabal b/clckwrks-plugin-page.cabal
--- a/clckwrks-plugin-page.cabal
+++ b/clckwrks-plugin-page.cabal
@@ -1,5 +1,5 @@
 name:                clckwrks-plugin-page
-version:             0.4.3.13
+version:             0.4.3.15
 synopsis:            support for CMS/Blogging in clckwrks
 description:         This provides two similar concepts Pages and Posts. Both allow
                      you to create page content by editting pages in the browser. A Post
@@ -13,7 +13,7 @@
 category:            Clckwrks
 build-type:          Custom
 cabal-version:       >=1.8
-tested-with:         GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1
+tested-with:         GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1, GHC == 8.6.3
 
 source-repository head
     type:     git
@@ -45,7 +45,7 @@
                        Clckwrks.Page.Atom
   other-modules:
                        Clckwrks.Page.Verbatim
-  build-depends:       base                   >= 4.3 && < 4.12,
+  build-depends:       base                   >= 4.3 && < 4.13,
                        acid-state             >= 0.12 && < 0.15,
                        aeson                  (>= 0.4  && < 0.10) || (>= 0.11 && < 1.5),
                        attoparsec             >= 0.10 && < 0.14,
@@ -69,7 +69,7 @@
                        text                   >= 0.11 && < 1.3,
                        time                   >= 1.4  && < 1.10,
                        time-locale-compat     >= 0.1  && < 0.2,
-                       template-haskell       >= 2.7  && <= 2.14,
+                       template-haskell       >= 2.7  && <= 2.15,
                        uuid                   >= 1.2  && <= 1.4,
                        uuid-orphans           >= 1.2  && < 1.5,
                        web-plugins            == 0.2.*,