Index: shipping/uc_quote/uc_quote.module
===================================================================
--- shipping/uc_quote/uc_quote.module	(revision 1)
+++ shipping/uc_quote/uc_quote.module	(working copy)
@@ -402,7 +402,7 @@
   //drupal_set_message('<pre>'. print_r($quote_data, TRUE) .'</pre>');
   if ($messages && variable_get('uc_quote_log_errors', FALSE)) {
     watchdog('quote', $messages, NULL, WATCHDOG_WARNING);
-    watchdog('quote', '<pre>'. print_r($quote_data, TRUE) .'</pre>', NULL, WATCHDOG_WARNING);
+    watchdog('quote', '<pre>@data</pre>', array('@data' => print_r($quote_data, TRUE)), WATCHDOG_WARNING);
   }
   return $quote_data;
 }
Index: uc_store/includes/simplexml.php
===================================================================
--- uc_store/includes/simplexml.php	(revision 1)
+++ uc_store/includes/simplexml.php	(working copy)
@@ -263,7 +263,8 @@
    */
   function _handleError($code, $line, $col)
   {
-    watchdog('JSimpleXML', 'XML Parsing Error at '.$line.':'.$col.'. Error '.$code.': '.xml_error_string($code), WATCHDOG_ERROR);
+    watchdog('JSimpleXML', 'XML Parsing Error at %line:%col Error %code: %xmlerrstr',
+      array('%line' => $line, '%col' => $col, '%code' => $code, '%xmlerrstr' => xml_error_string($code)), WATCHDOG_ERROR);
   }
 
   /**
@@ -676,4 +677,4 @@
     //Return the final output
     return $out;
   }
-}
\ No newline at end of file
+}
Index: uc_catalog/uc_catalog.module
===================================================================
--- uc_catalog/uc_catalog.module	(revision 1)
+++ uc_catalog/uc_catalog.module	(working copy)
@@ -62,7 +62,8 @@
   $items = array();
 
   $items['catalog'] = array(
-    'title' => variable_get('uc_catalog_name', t('Catalog')),
+    'title callback' => 'variable_get',
+    'title arguments => array('uc_catalog_name', t('Catalog')),
     'page callback' => 'theme',
     'page arguments' => array('uc_catalog_browse'),
     'access arguments' => array('view catalog'),
Index: payment/uc_credit/uc_credit.module
===================================================================
--- payment/uc_credit/uc_credit.module	(revision 1)
+++ payment/uc_credit/uc_credit.module	(working copy)
@@ -881,7 +881,7 @@
         if (!$file = fopen($dir .'/uc_credit.key', 'wb')) {
           $message = t('Credit card encryption key file creation failed. Check your filepath settings and directory permissions.');
           drupal_set_message($message, 'error');
-          watchdog('uc_credit', $message, WATCHDOG_ERROR);
+          watchdog('uc_credit', $message, NULL, WATCHDOG_ERROR);
         }
         else {
           // Replacement key generation suggested by Barry Jaspan for increased security.
Index: payment/uc_cybersource/uc_cybersource.module
===================================================================
--- payment/uc_cybersource/uc_cybersource.module	(revision 1)
+++ payment/uc_cybersource/uc_cybersource.module	(working copy)
@@ -369,7 +369,7 @@
   curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 0);
   $response = curl_exec($ch);
   if ($error = curl_error($ch)) {
-    watchdog('uc_cybersource', $error, WATCHDOG_ERROR);
+    watchdog('uc_cybersource', '@error', array('@error' => $error), WATCHDOG_ERROR);
   }
   curl_close($ch);