diff --git a/core/modules/node/node.pages.inc b/core/modules/node/node.pages.inc
index ab8b5f1..c54a794 100644
--- a/core/modules/node/node.pages.inc
+++ b/core/modules/node/node.pages.inc
@@ -38,7 +38,12 @@ function node_add_page() {
     $item = array_shift($content);
     drupal_goto($item['href']);
   }
-  return theme('node_add_list', array('content' => $content));
+  $build['node_add_page'] = array(
+    '#theme' => 'node_add_list',
+    '#content' => $content,
+  );
+
+  return $build;
 }
 
 /**
@@ -600,7 +605,7 @@ function node_delete_confirm_submit($form, &$form_state) {
 function node_revision_overview($node) {
   drupal_set_title(t('Revisions for %title', array('%title' => $node->title)), PASS_THROUGH);
 
-  $header = array(t('Revision'), array('data' => t('Operations'), 'colspan' => 2));
+  $header = array('revision' => t('Revision'), 'operations' => array('data' => t('Operations'), 'colspan' => 2));
 
   $revisions = node_revision_list($node);
 
@@ -618,22 +623,22 @@ function node_revision_overview($node) {
     $operations = array();
 
     if ($revision->current_vid > 0) {
-      $row[] = array('data' => t('!date by !username', array('!date' => l(format_date($revision->timestamp, 'short'), "node/$node->nid"), '!username' => theme('username', array('account' => $revision))))
+      $row['revision'] = array('data' => t('!date by !username', array('!date' => l(format_date($revision->timestamp, 'short'), "node/$node->nid"), '!username' => theme('username', array('account' => $revision))))
                                . (($revision->log != '') ? '<p class="revision-log">' . filter_xss($revision->log) . '</p>' : ''),
                      'class' => array('revision-current'));
-      $operations[] = array('data' => drupal_placeholder(t('current revision')), 'class' => array('revision-current'), 'colspan' => 2);
+      $operations['current'] = array('data' => drupal_placeholder(t('current revision')), 'class' => array('revision-current'), 'colspan' => 2);
     }
     else {
-      $row[] = t('!date by !username', array('!date' => l(format_date($revision->timestamp, 'short'), "node/$node->nid/revisions/$revision->vid/view"), '!username' => theme('username', array('account' => $revision))))
+      $row['revision'] = t('!date by !username', array('!date' => l(format_date($revision->timestamp, 'short'), "node/$node->nid/revisions/$revision->vid/view"), '!username' => theme('username', array('account' => $revision))))
                . (($revision->log != '') ? '<p class="revision-log">' . filter_xss($revision->log) . '</p>' : '');
       if ($revert_permission) {
-        $operations[] = l(t('revert'), "node/$node->nid/revisions/$revision->vid/revert");
+        $operations['revert'] = l(t('revert'), "node/$node->nid/revisions/$revision->vid/revert");
       }
       if ($delete_permission) {
-        $operations[] = l(t('delete'), "node/$node->nid/revisions/$revision->vid/delete");
+        $operations['delete'] = l(t('delete'), "node/$node->nid/revisions/$revision->vid/delete");
       }
     }
-    $rows[] = array_merge($row, $operations);
+    $rows[$revision->vid] = array_merge($row, $operations);
   }
 
   $build['node_revisions_table'] = array(