diff --git a/payment/uc_cybersource/uc_cybersource.module b/payment/uc_cybersource/uc_cybersource.module
index c1ad9cd..eafbdb3 100644
--- a/payment/uc_cybersource/uc_cybersource.module
+++ b/payment/uc_cybersource/uc_cybersource.module
@@ -117,7 +117,7 @@ function uc_cybersource_uc_payment_gateway() {
 function uc_cybersource_hop_post() {
   if (!uc_cybersource_hop_include()) {
     watchdog('uc_cybersource_hop', 'Unable to receive HOP POST due to missing or unreadable HOP.php file.', array(), 'error');
-    drupal_set_header('HTTP/1.1 503 Service unavailable');
+    drupal_add_http_header('HTTP/1.1 503 Service unavailable');
     drupal_set_title(t('Unable to receive HOP POST.'));
     print t('The site was unable to receive a HOP post because of a missing or unreadble HOP.php');
     exit();
diff --git a/payment/uc_google_checkout/uc_google_checkout.module b/payment/uc_google_checkout/uc_google_checkout.module
index 391a1d2..6161021 100644
--- a/payment/uc_google_checkout/uc_google_checkout.module
+++ b/payment/uc_google_checkout/uc_google_checkout.module
@@ -1170,7 +1170,7 @@ function uc_google_checkout_cancel_order($order) {
 }
 
 function uc_google_checkout_notification_acknowledgement($serial_number) {
-  drupal_set_header('200 OK');
+  drupal_add_http_header('200 OK');
   print '<?xml version="1.0" encoding="UTF-8"?>';
   print "\n";
   print '<notification-acknowledgment xmlns="http://checkout.google.com/schema/2" serial-number="' . $serial_number . '" />';
@@ -1181,7 +1181,7 @@ function uc_google_checkout_notification_error($message = NULL) {
   if (is_null($message)) {
     $message = t('Unknown order id or malformed XML.');
   }
-  drupal_set_header('400 Bad Request');
+  drupal_add_http_header('400 Bad Request');
   watchdog('google', '!message', array('!message' => $message), WATCHDOG_ERROR);
   exit();
 }
diff --git a/payment/uc_google_checkout/uc_google_checkout.pages.inc b/payment/uc_google_checkout/uc_google_checkout.pages.inc
index 6146e77..0d0da84 100644
--- a/payment/uc_google_checkout/uc_google_checkout.pages.inc
+++ b/payment/uc_google_checkout/uc_google_checkout.pages.inc
@@ -126,12 +126,12 @@ function uc_google_checkout_merchant_calculation() {
     $response .= '</results>';
     $response .= '</merchant-calculation-results>';
 
-    drupal_set_header('HTTP/1.1 200 OK');
+    drupal_add_http_header('HTTP/1.1 200 OK');
     print $response;
     exit();
   }
 
-  drupal_set_header('HTTP/1.1 204 No Content');
+  drupal_add_http_header('HTTP/1.1 204 No Content');
   exit();
   // So there!
 }
diff --git a/shipping/uc_ups/uc_ups.module b/shipping/uc_ups/uc_ups.module
index 1403b07..d8e1e1c 100644
--- a/shipping/uc_ups/uc_ups.module
+++ b/shipping/uc_ups/uc_ups.module
@@ -843,6 +843,7 @@ function uc_ups_quote($products, $details, $method) {
           $key = $last_key;
         }
       }
+dpm($product);
       if (!isset($product->pkg_qty) || !$product->pkg_qty) {
         $product->pkg_qty = 1;
       }
diff --git a/uc_reports/uc_reports.module b/uc_reports/uc_reports.module
index 3bedb8f..0a5f902 100644
--- a/uc_reports/uc_reports.module
+++ b/uc_reports/uc_reports.module
@@ -267,7 +267,7 @@ function _uc_reports_get_csv($report_id, $user_id) {
     );
     foreach ($http_headers as $header => $value) {
       $value = preg_replace('/\r?\n(?!\t| )/', '', $value);
-      drupal_set_header($header, $value);
+      drupal_add_http_header($header, $value);
     }
 
     print $csv_data->data;
diff --git a/uc_store/includes/coder_review_uc3x.inc b/uc_store/includes/coder_review_uc3x.inc
index 1554505..7406a27 100644
--- a/uc_store/includes/coder_review_uc3x.inc
+++ b/uc_store/includes/coder_review_uc3x.inc
@@ -87,6 +87,13 @@ function coder_review_uc3x_reviews() {
       '#not' => '[\'"]#price',
       '#warning' => 'theme_uc_product_price() takes a render element with a "#value" and optional "#title" and "#attributes".'
     ),
+
+    // uc_add_js() is no longer needed - use drupal_add_js() instead.
+    array(
+      '#type' => 'regex',
+      '#value' => '\buc_add_js\s*\(',
+      '#warning' => 'uc_add_js() is no longer needed - use drupal_add_js() instead.',
+    ),
   );
 
   $review = array(
diff --git a/uc_store/uc_store.module b/uc_store/uc_store.module
index e335200..83fb0c2 100644
--- a/uc_store/uc_store.module
+++ b/uc_store/uc_store.module
@@ -395,9 +395,9 @@ function uc_store_page_alter(&$page) {
  */
 function uc_store_exit() {
   // Don't save anything to the session if this is the first request of a session
-  if (empty($_COOKIE[session_name()])) {
-    return;
-  }
+//  if (empty($_COOKIE[session_name()])) {
+//    return;
+//  }
 
   // Save the current request for tracking paths on subsequent page requests.
   // When HTTP_REFERER is set, the session version is not; and vice versa.
@@ -1747,7 +1747,7 @@ function uc_referer_check($urls) {
 }
 
 /**
- * Provides a more reliable referrer for Ubercart.
+ * Provides a more reliable referer for Ubercart.
  */
 function uc_referer_uri() {
   if ($_SERVER['HTTP_REFERER'] == '') {