diff --git a/modules/filter/filter.install b/modules/filter/filter.install
index 0c9e22e..216b6ef 100644
--- a/modules/filter/filter.install
+++ b/modules/filter/filter.install
@@ -234,7 +234,7 @@ function filter_update_7004() {
 
   // Enable all existing filters ({filter} contained only enabled previously).
   db_update('filter')
-    ->fields('status', '1')
+    ->fields(array('status' => '1'))
     ->execute();
 
   // Move filter settings from system variables into {filter}.settings.
@@ -262,7 +262,7 @@ function filter_update_7004() {
       }
     }
     if (!empty($settings)) {
-    	db_upddate('filter')
+    	db_update('filter')
     	  ->fields(array('settings' => serialize($settings)))
     	  ->condition('format', $filter->format)
     	  ->condition('name', $filter->name)
diff --git a/modules/node/node.install b/modules/node/node.install
index cdf381e..0fdeda4 100644
--- a/modules/node/node.install
+++ b/modules/node/node.install
@@ -369,6 +369,7 @@ function node_update_7000() {
     ->fields(array('module' => 'node_content'))
     ->condition('module', 'node')
     ->execute();
+  db_change_field('node_type', 'module', 'base', array('type' => 'varchar', 'length' => 255, 'not null' => TRUE));
 }
 
 /**
@@ -434,6 +435,8 @@ function node_update_7005() {
  * Convert body and teaser from node properties to fields, and migrate status/comment/promote and sticky columns to the {node_revision} table.
  */
 function node_update_7006(&$context) {
+  taxonomy_update_7002();
+
   $context['#finished'] = 0;
 
   // Get node type info for every invocation.
diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install
index 9a34597..ce277e6 100644
--- a/modules/taxonomy/taxonomy.install
+++ b/modules/taxonomy/taxonomy.install
@@ -218,23 +218,27 @@ function taxonomy_schema() {
  * Add vocabulary machine_name column.
  */
 function taxonomy_update_7002() {
-  $field = array(
-    'type' => 'varchar',
-    'length' => 255,
-    'not null' => TRUE,
-    'default' => '',
-    'description' => 'The vocabulary machine name.',
-  );
 
-  db_add_field('taxonomy_vocabulary', 'machine_name', $field);
+  if (!variable_get('taxonomy_update_7002_run', FALSE)) {
+    $field = array(
+      'type' => 'varchar',
+      'length' => 255,
+      'not null' => TRUE,
+      'default' => '',
+      'description' => 'The vocabulary machine name.',
+    );
 
-  foreach (taxonomy_get_vocabularies() as $vid => $vocabulary) {
-    $machine_name = 'vocabulary_' . $vid;
-    db_update('taxonomy_vocabulary')
-      ->fields(array('machine_name' => 'vocabulary_' . $vid))
-      ->condition('vid', $vid)
-      ->execute();
-    field_attach_create_bundle('taxonomy_term', $machine_name);
+    db_add_field('taxonomy_vocabulary', 'machine_name', $field);
+
+    foreach (taxonomy_get_vocabularies() as $vid => $vocabulary) {
+      $machine_name = 'vocabulary_' . $vid;
+      db_update('taxonomy_vocabulary')
+        ->fields(array('machine_name' => 'vocabulary_' . $vid))
+        ->condition('vid', $vid)
+        ->execute();
+      field_attach_create_bundle('taxonomy_term', $machine_name);
+    }
+    variable_set('taxonomy_update_7002_run', TRUE);
   }
 }
 
diff --git a/modules/user/user.install b/modules/user/user.install
index a544ae3..8add1c1 100644
--- a/modules/user/user.install
+++ b/modules/user/user.install
@@ -427,13 +427,13 @@ function user_update_7004(&$sandbox) {
     // Initialize batch update information.
     $sandbox['progress'] = 0;
     $sandbox['last_user_processed'] = -1;
-    $sandbox['max'] = db_query("SELECT COUNT(*) FROM {user} WHERE picture <> ''")->fetchField();
+    $sandbox['max'] = db_query("SELECT COUNT(*) FROM {users} WHERE picture <> ''")->fetchField();
   }
 
   // As a batch operation move the photos into the {file} table and update the
   // {users} records.
   $limit = 500;
-  $result = db_query_range("SELECT uid, picture FROM {user} WHERE picture <> '' AND uid > :uid ORDER BY uid", 0, $limit, array(':uid' => $sandbox['last_user_processed']));
+  $result = db_query_range("SELECT uid, picture FROM {users} WHERE picture <> '' AND uid > :uid ORDER BY uid", 0, $limit, array(':uid' => $sandbox['last_user_processed']));
   foreach ($result as $user) {
     // Don't bother adding files that don't exist.
     if (!file_exists($user->picture)) {
@@ -473,8 +473,8 @@ function user_update_7004(&$sandbox) {
   // When we're finished, drop the old picture field and rename the new one to
   // replace it.
   if (isset($sandbox['#finished']) && $sandbox['#finished'] == 1) {
-    db_drop_field('user', 'picture');
-    db_change_field('user', 'picture_fid', 'picture', $picture_field);
+    db_drop_field('users', 'picture');
+    db_change_field('users', 'picture_fid', 'picture', $picture_field);
   }
 }
 
diff --git a/sites/all/README.txt b/sites/all/README.txt
old mode 100644
new mode 100755
diff --git a/sites/all/modules/README.txt b/sites/all/modules/README.txt
old mode 100644
new mode 100755
diff --git a/sites/all/themes/README.txt b/sites/all/themes/README.txt
old mode 100644
new mode 100755