diff --git a/includes/batch.inc b/includes/batch.inc
index 63629875817..bb4679b46e5 100644
--- a/includes/batch.inc
+++ b/includes/batch.inc
@@ -143,7 +143,7 @@ function _batch_progress_page_nojs() {
     print $fallback;
 
     // Perform actual processing.
-    list($percentage, $message) = _batch_process($batch);
+    list($percentage, $message) = _batch_process();
     if ($percentage == 100) {
       $new_op = 'finished';
     }
diff --git a/includes/install.pgsql.inc b/includes/install.pgsql.inc
index 5c2c21d6b07..09f9164ef53 100644
--- a/includes/install.pgsql.inc
+++ b/includes/install.pgsql.inc
@@ -100,7 +100,7 @@ function drupal_test_pgsql($url, &$success) {
   // Test UNLOCK, which is done automatically upon transaction end in PostgreSQL
   $query = 'COMMIT';
   $result = pg_query($connection, $query);
-  if ($error = pg_result_error()) {
+  if ($error = pg_result_error($result)) {
     drupal_set_message(st('Failed to unlock a test table on your PostgreSQL database server. We tried unlocking a table with the command %query and PostgreSQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error');
     $err = TRUE;
   }
@@ -111,7 +111,7 @@ function drupal_test_pgsql($url, &$success) {
   // Test DELETE.
   $query = 'DELETE FROM drupal_install_test';
   $result = pg_query($connection, $query);
-  if ($error = pg_result_error()) {
+  if ($error = pg_result_error($result)) {
     drupal_set_message(st('Failed to delete a value from a test table on your PostgreSQL database server. We tried deleting a value with the command %query and PostgreSQL reported the following error: %error.', array('%query' => $query, '%error' => $error)), 'error');
     $err = TRUE;
   }
@@ -122,7 +122,7 @@ function drupal_test_pgsql($url, &$success) {
   // Test DROP.
   $query = 'DROP TABLE drupal_install_test';
   $result = pg_query($connection, $query);
-  if ($error = pg_result_error()) {
+  if ($error = pg_result_error($result)) {
     drupal_set_message(st('Failed to drop a test table from your PostgreSQL database server. We tried dropping a table with the command %query and PostgreSQL reported the following error %error.', array('%query' => $query, '%error' => $error)), 'error');
     $err = TRUE;
   }
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index a62f246e196..2601513573e 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -42,7 +42,7 @@ function menu_overview_form(&$form_state, $menu) {
   menu_tree_check_access($tree, $node_links);
   $menu_admin = FALSE;
 
-  $form = _menu_overview_tree_form($tree);
+  $form = _menu_overview_tree_form($tree, $form_state);
   $form['#menu'] =  $menu;
   if (element_children($form)) {
     $form['submit'] = array(
@@ -59,7 +59,7 @@ function menu_overview_form(&$form_state, $menu) {
 /**
  * Recursive helper function for menu_overview_form().
  */
-function _menu_overview_tree_form($tree) {
+function _menu_overview_tree_form($tree, $form_state) {
   static $form = array('#tree' => TRUE);
   foreach ($tree as $data) {
     $title = '';
@@ -111,7 +111,7 @@ function _menu_overview_tree_form($tree) {
     }
 
     if ($data['below']) {
-      _menu_overview_tree_form($data['below']);
+      _menu_overview_tree_form($data['below'], $form_state);
     }
   }
   return $form;
diff --git a/modules/openid/openid.inc b/modules/openid/openid.inc
index 70dbee9202e..72a500eda27 100644
--- a/modules/openid/openid.inc
+++ b/modules/openid/openid.inc
@@ -245,14 +245,14 @@ function _openid_signature($association, $message_array, $keys_to_sign) {
 
 function _openid_hmac($key, $text) {
   if (strlen($key) > OPENID_SHA1_BLOCKSIZE) {
-    $key = _openid_sha1($key, true);
+    $key = _openid_sha1($key);
   }
 
   $key = str_pad($key, OPENID_SHA1_BLOCKSIZE, chr(0x00));
   $ipad = str_repeat(chr(0x36), OPENID_SHA1_BLOCKSIZE);
   $opad = str_repeat(chr(0x5c), OPENID_SHA1_BLOCKSIZE);
-  $hash1 = _openid_sha1(($key ^ $ipad) . $text, true);
-  $hmac = _openid_sha1(($key ^ $opad) . $hash1, true);
+  $hash1 = _openid_sha1(($key ^ $ipad) . $text);
+  $hmac = _openid_sha1(($key ^ $opad) . $hash1);
 
   return $hmac;
 }
diff --git a/themes/garland/maintenance-page.tpl.php b/themes/garland/maintenance-page.tpl.php
index 91987d7204c..e11dc02a643 100644
--- a/themes/garland/maintenance-page.tpl.php
+++ b/themes/garland/maintenance-page.tpl.php
@@ -22,7 +22,7 @@
       <?php print phptemplate_get_ie_styles(); ?>
     <![endif]-->
   </head>
-  <body<?php print phptemplate_body_class($left, $right); ?>>
+  <body<?php phptemplate_body_class($left, $right); ?>>
 
 <!-- Layout -->
   <div id="header-region" class="clear-block"><?php print $header; ?></div>
diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php
index 8c7ff9a2964..c5a00058838 100644
--- a/themes/garland/page.tpl.php
+++ b/themes/garland/page.tpl.php
@@ -11,7 +11,7 @@
       <?php print phptemplate_get_ie_styles(); ?>
     <![endif]-->
   </head>
-  <body<?php print phptemplate_body_class($left, $right); ?>>
+  <body<?php phptemplate_body_class($left, $right); ?>>
 
 <!-- Layout -->
   <div id="header-region" class="clear-block"><?php print $header; ?></div>