diff --git a/php/lib/block.mtentries.php b/php/lib/block.mtentries.php
index da9dda2d88..d93a5cf563 100644
--- a/php/lib/block.mtentries.php
+++ b/php/lib/block.mtentries.php
@@ -60,7 +60,7 @@ function smarty_block_mtentries($args, $content, &$ctx, &$repeat) {
             ($args['limit'] || $args['lastn']) or $args['lastn'] = -1;
             $archiver->setup_args($ctx, $args);
         }
-        if (($cat = $ctx->stash('category')) && $args['class'] == 'entry') {
+        if (($cat = $ctx->stash('category')) && ($args['class'] == 'entry' || $args['class'] == 'page')) {
             $args['category'] or $args['categories'] or $args['category_id'] = $cat['category_id'];
             if ($ctx->stash('inside_mt_categories')) {
                 $args['category_id'] = $cat['category_id'];
diff --git a/php/lib/block.mtfolderfooter.php b/php/lib/block.mtfolderfooter.php
index 0c5f5fc812..e6d20cfd27 100644
--- a/php/lib/block.mtfolderfooter.php
+++ b/php/lib/block.mtfolderfooter.php
@@ -9,8 +9,9 @@ function smarty_block_mtfolderfooter($args, $content, &$ctx, &$repeat) {
     if (!isset($content)) {
         $categories =& $ctx->stash('_categories');
         $counter = $ctx->stash('_categories_counter');
+
         return $ctx->_hdlr_if($args, $content, $ctx, $repeat, 
-            ($counter == count($categories) || $ctx->stash('subFolderFoot'))
+                              ((isset($counter) && isset($categories)) && $counter == count($categories) || $ctx->stash('subFolderFoot'))
         );
     } else {
         return $ctx->_hdlr_if($args, $content, $ctx, $repeat);
diff --git a/php/lib/function.mtsubcatsrecurse.php b/php/lib/function.mtsubcatsrecurse.php
index 3d1140cf9d..757e4d70fa 100644
--- a/php/lib/function.mtsubcatsrecurse.php
+++ b/php/lib/function.mtsubcatsrecurse.php
@@ -6,7 +6,7 @@
 # $Id$
 
 function smarty_function_mtsubcatsrecurse($args, &$ctx) {
-    $localvars = array('subCatsDepth', 'category', 'subCatIsFirst', 'subCatIsLast');
+  $localvars = array('subCatsDepth', 'category', 'subCatIsFirst', 'subCatIsLast', 'subFolderHead', 'subFolderFoot');
     $fn = $ctx->stash('subCatTokens');
     #if (!method_exists($ctx,$fn)) {
     #    return $ctx->error("Called SubCatsRecurse outside of SubCategories tag!");