1 files changed, 4 insertions, 4 deletions

diff --git a/server/src/Thermoprint/Server.hs b/server/src/Thermoprint/Server.hs
index 15fb651..a33a613 100644
--- a/server/src/Thermoprint/Server.hs
+++ b/server/src/Thermoprint/Server.hs
@@ -111,7 +111,7 @@ instance MonadIO m => Default (Config m) where
                }
 
 instance MonadIO m => Default (QMConfig m) where
-  def = QMConfig idQM $ Nat (liftIO . runIdentityT)
+  def = QMConfig idQM $ NT (liftIO . runIdentityT)
 
 withPrinters :: MonadResource m => Config m -> [(m PrinterMethod, QMConfig m)] -> m (Config m)
 -- ^ Add a list of printers to a 'Config'
@@ -149,7 +149,7 @@ thermoprintServer dyre io cfg = do
     , Dyre.cacheDir    = return <$> cacheDir
     }
   where
-    realMain cfg = unNat (io . Nat runResourceT) $ do
+    realMain cfg = (io . NT runResourceT) $$ do
       tMgr <- threadManager resourceForkIO
       flip finally (cleanup tMgr) $ do
         Config{..} <- cfg
@@ -159,11 +159,11 @@ thermoprintServer dyre io cfg = do
         gcChan <- liftIO newTChanIO
         fork tMgr $ jobGC gcChan
         let
-          runQM' (queueManagers -> QMConfig qm nat) printer = unNat nat $ runQM gcChan qm printer
+          runQM' (queueManagers -> QMConfig qm nat) printer = nat $$ runQM gcChan qm printer
         mapM_ (fork tMgr . uncurry runQM') $ Map.toList printers
         nChan <- liftIO $ newBroadcastTChanIO
         let
           printerUrl :: API.PrinterId -> URI
-          printerUrl = safeLink thermoprintAPI (Proxy :: Proxy ("jobs" :> QueryParam "printer" API.PrinterId :> Get '[JSON] (Seq (API.JobId, UTCTime, JobStatus)))) . Just
+          printerUrl = linkURI . safeLink thermoprintAPI (Proxy :: Proxy ("jobs" :> QueryParam "printer" API.PrinterId :> Get '[JSON] (Seq (API.JobId, UTCTime, JobStatus)))) . Just
         mapM_ (fork tMgr . uncurry (notifyOnChange nChan ((==) `on` fromZipper)) . bimap printerUrl queue) $ Map.toList printers
         liftIO . Warp.runSettings warpSettings . withPush nChan . serve thermoprintAPI . flip enter API.thermoprintServer =<< handlerNat printers nChan