diff --git a/yesod-core/Yesod/Handler.hs b/yesod-core/Yesod/Handler.hs
index 98debbf9..4f17e0f4 100644
--- a/yesod-core/Yesod/Handler.hs
+++ b/yesod-core/Yesod/Handler.hs
@@ -753,19 +753,19 @@ lookupSessionBS n = do
     return $ Map.lookup n m
 
 -- | Get all session variables.
-getSession :: GHandler s m SessionMap
+getSession :: GHandler sub master SessionMap
 getSession = liftM ghsSession get
 
 handlerToYAR :: (HasReps a, HasReps b)
-             => m -- ^ master site foundation
-             -> s -- ^ sub site foundation
-             -> (Route s -> Route m)
-             -> (Route m -> [(Text, Text)] -> Text)
-             -> (ErrorResponse -> GHandler s m a)
+             => master -- ^ master site foundation
+             -> sub    -- ^ sub site foundation
+             -> (Route sub -> Route master)
+             -> (Route master -> [(Text, Text)] -> Text) -- route renderer
+             -> (ErrorResponse -> GHandler sub master a)
              -> Request
-             -> Maybe (Route s)
+             -> Maybe (Route sub)
              -> SessionMap
-             -> GHandler s m b
+             -> GHandler sub master b
              -> ResourceT IO YesodAppResult
 handlerToYAR y s toMasterRoute render errorHandler rr murl sessionMap h =
     unYesodApp ya eh' rr types sessionMap
diff --git a/yesod-core/Yesod/Internal/Core.hs b/yesod-core/Yesod/Internal/Core.hs
index 1001ce5b..6018642c 100644
--- a/yesod-core/Yesod/Internal/Core.hs
+++ b/yesod-core/Yesod/Internal/Core.hs
@@ -350,8 +350,8 @@ defaultYesodRunner :: Yesod master
                    -> (Route sub -> Route master)
                    -> Maybe CS.Key
                    -> W.Application
-defaultYesodRunner _ m _ murl toMaster _ req
-    | maximumContentLength m (fmap toMaster murl) < len =
+defaultYesodRunner _ master _ murl toMaster _ req
+    | maximumContentLength master (fmap toMaster murl) < len =
         return $ W.responseLBS
             (H.Status 413 "Too Large")
             [("Content-Type", "text/plain")]
@@ -633,13 +633,13 @@ ynHelper render scripts jscript jsLoc =
 yesodRender :: Yesod y
             => y
             -> Route y
-            -> [(Text, Text)]
+            -> [(Text, Text)] -- ^ url query string
             -> Text
-yesodRender y u qs =
+yesodRender y url params =
     TE.decodeUtf8 $ toByteString $
     fromMaybe
         (joinPath y (approot y) ps
-          $ qs ++ qs')
-        (urlRenderOverride y u)
+          $ params ++ params')
+        (urlRenderOverride y url)
   where
-    (ps, qs') = renderRoute u
+    (ps, params') = renderRoute url