diff --git a/conf/default_context.xml b/conf/default_context.xml
index de88059a47..6ad54df5aa 100644
--- a/conf/default_context.xml
+++ b/conf/default_context.xml
@@ -42,8 +42,8 @@
 
   <extension name="set_codec" continue="true">
     <condition field="source" expression="mod_portaudio">
-      <action application="set" data="absolute_codec_string=PCMU"/>
-      <action application="set" data="export_vars=absolute_codec_string"/>
+      <action application="export" data="absolute_codec_string=$${global_codec_prefs}"/>
+      <action application="export" data="nolocal:jitterbuffer_msec=180"/>
     </condition>
   </extension>
 
diff --git a/conf/iax.conf.xml b/conf/iax.conf.xml
index df4109d2a1..60eda64034 100644
--- a/conf/iax.conf.xml
+++ b/conf/iax.conf.xml
@@ -1,7 +1,7 @@
 <configuration name="iax.conf" description="IAX Configuration">
   <settings>
     <param name="debug" value="0"/>
-    <!-- <param name="ip" value="1.2.3.4"> -->
+    <!-- <param name="ip" value="1.2.3.4"/> -->
     <param name="port" value="4569"/>
     <param name="dialplan" value="XML"/>
     <param name="codec-prefs" value="PCMU@20i,PCMA,speex,L16"/>