diff --git a/src/Jobs/Handler/Files.hs b/src/Jobs/Handler/Files.hs
index 796c02c55..b9817f649 100644
--- a/src/Jobs/Handler/Files.hs
+++ b/src/Jobs/Handler/Files.hs
@@ -57,9 +57,9 @@ dispatchJobPruneUnreferencedFiles = JobHandlerAtomic . hoist lift $ do
   where
     getCandidates = E.selectSource . E.from $ \fileContent -> do
       E.where_ . E.not_ . E.any E.exists $ fileReferences (fileContent E.^. FileContentHash)
-      return $ ( fileContent E.^. FileContentHash
-               , E.length_ $ fileContent E.^. FileContentContent
-               )
+      return ( fileContent E.^. FileContentHash
+             , E.length_ $ fileContent E.^. FileContentContent
+             )
 
 
 dispatchJobInjectFiles :: JobHandler UniWorX
diff --git a/src/Utils/PersistentTokenBucket.hs b/src/Utils/PersistentTokenBucket.hs
index 5cec01339..667898003 100644
--- a/src/Utils/PersistentTokenBucket.hs
+++ b/src/Utils/PersistentTokenBucket.hs
@@ -23,12 +23,12 @@ persistentTokenBucketTryAlloc' :: (MonadHandler m, HasAppSettings (HandlerSite m
                                -> SqlPersistT m Bool
 persistentTokenBucketTryAlloc' tbsIdent tokens = do
   TokenBucketConf{..} <- getsYesod $ views _appPersistentTokenBuckets ($ tbsIdent)
-  flip persistentTokenBucketTryAlloc tokens TokenBucketSettings 
+  persistentTokenBucketTryAlloc TokenBucketSettings 
     { tbsIdent
     , tbsDepth = tokenBucketDepth
     , tbsInvRate = tokenBucketInvRate
     , tbsInitialValue = tokenBucketInitialValue
-    }
+    } tokens
 
 
 persistentTokenBucketTryAlloc :: (MonadIO m, Integral a) => TokenBucketSettings -> a -> SqlPersistT m Bool
@@ -65,12 +65,12 @@ persistentTokenBucketTakeC' :: forall i m a.
                             -> ConduitT i i (ReaderT SqlBackend m) ()
 persistentTokenBucketTakeC' tbsIdent cTokens = do
   TokenBucketConf{..} <- getsYesod $ views _appPersistentTokenBuckets ($ tbsIdent)
-  flip persistentTokenBucketTakeC cTokens TokenBucketSettings 
+  persistentTokenBucketTakeC TokenBucketSettings 
     { tbsIdent
     , tbsDepth = tokenBucketDepth
     , tbsInvRate = tokenBucketInvRate
     , tbsInitialValue = tokenBucketInitialValue
-    }
+    } cTokens
 
 persistentTokenBucketTakeC :: forall i m a.
                               (MonadIO m, Integral a)