diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index a22e629ea21..e3518915279 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -193,8 +193,8 @@ function referer_uri() {
 function arg($index) {
   static $arguments, $q;
 
-  if (empty($arguments) || $q != $_GET["q"]) {
-    $arguments = explode("/", $_GET["q"]);
+  if (empty($arguments) || $q != $_GET['q']) {
+    $arguments = explode('/', $_GET['q']);
   }
 
   return $arguments[$index];
diff --git a/includes/common.inc b/includes/common.inc
index f4cbac5948e..f8ee497ca45 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -4,7 +4,7 @@
 /**
  * @defgroup common Core functions
  */
-
+ 
 /**
  * @name Page title
  * @ingroup common
@@ -92,31 +92,6 @@ function drupal_get_breadcrumb() {
 }
 /* @} */
 
-/**
- * @name Page tabs
- * @ingroup common
- *
- * Functions to get and set the tabs of the current page.
- * @{
- */
-
-/**
- * @param $tab Array of links to use for tabs
- */
-function drupal_set_tab($tab = NULL) {
-  static $stored_tab = array();
-
-  if (!is_null($tab)) {
-    $stored_tab[] =  $tab;
-  }
-  return $stored_tab;
-}
-
-function drupal_get_tab() {
-  return drupal_set_tab();
-}
-/* @} */
-
 /**
  * @name HTML head contents
  * @ingroup common
diff --git a/includes/file.inc b/includes/file.inc
index 5c6994330ad..8994ea9d286 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -94,7 +94,7 @@ function file_check_upload($source) {
     $file->path = $_FILES["edit"]["tmp_name"][$source];
     $file->error = $_FILES["edit"]["error"][$source];
     $file->size = $_FILES["edit"]["size"][$source];
-    $file->source = $_FILES["edit"]["size"][$source];
+    $file->source = $_FILES["edit"]["source"][$source];
     return $file;
   }
 }