diff --git a/advagg.module b/advagg.module
index 834dfe1..6795a96 100755
--- a/advagg.module
+++ b/advagg.module
@@ -2129,6 +2129,7 @@ function advagg_process_js($master_set, $noagg = FALSE) {
 
   // Get useful info.
   list($preprocess_js, $public_downloads, $query_string) = advagg_process_css_js_prep($noagg);
+  $advagg_json_encode_function = variable_get('advagg_json_encode_function', 'advagg_drupal_to_js');
 
   $output = array();
   foreach ($master_set as $scope => $javascript) {
@@ -2173,7 +2174,7 @@ function advagg_process_js($master_set, $noagg = FALSE) {
         case 'setting':
           $data = call_user_func_array('array_merge_recursive', $data);
           $js_settings_array[] = $data;
-          $js_settings = advagg_drupal_to_js($data);
+          $js_settings = $advagg_json_encode_function($data);
           $js_settings = preg_replace(array('/"DRUPAL_JS_RAW\:/', '/\:DRUPAL_JS_RAW"/'), array('', ''), $js_settings);
           $setting_no_preprocess[] = 'jQuery.extend(Drupal.settings, ' . $js_settings . ");";
           break;
diff --git a/advagg_js_cdn/advagg_js_cdn.module b/advagg_js_cdn/advagg_js_cdn.module
index 6790ab4..077754a 100755
--- a/advagg_js_cdn/advagg_js_cdn.module
+++ b/advagg_js_cdn/advagg_js_cdn.module
@@ -39,7 +39,7 @@ function advagg_js_cdn_advagg_js_pre_alter(&$javascript, $preprocess_js, $public
   // Set filepaths/versions
   $jquery_version = variable_get('advagg_js_cdn_jquery_version', '1.2.6');
   $jquery_filepath = 'misc/jquery.js';
-  if (module_exists('jquery_update')) {
+  if (module_exists('jquery_update') && variable_get('jquery_update_replace', TRUE)) {
     $jquery_update_filepath = drupal_get_path('module', 'jquery_update');
     $jquery_update_version = variable_get('advagg_js_cdn_jquery_update_version', '1.3.2');
   }