diff --git a/app/dialplan/resources/xml/dialplan/270_call_privacy.xml b/app/dialplan/resources/xml/dialplan/270_call_privacy.xml
index 769eb78fed..2dacde4d23 100644
--- a/app/dialplan/resources/xml/dialplan/270_call_privacy.xml
+++ b/app/dialplan/resources/xml/dialplan/270_call_privacy.xml
@@ -4,7 +4,7 @@
 			<action application="privacy" data="full"/>
 			<action application="set" data="sip_h_Privacy=id"/>
 			<action application="set" data="privacy=yes"/>
-			<action application="transfer" data="$1 XML default"/>
+			<action application="transfer" data="$1 XML ${context}"/>
 		</condition>
 	</extension>
 </context>
\ No newline at end of file
diff --git a/app/dialplan/resources/xml/dialplan/420_disa.xml b/app/dialplan/resources/xml/dialplan/420_disa.xml
index 1dd4f4f643..dd6b4e3255 100644
--- a/app/dialplan/resources/xml/dialplan/420_disa.xml
+++ b/app/dialplan/resources/xml/dialplan/420_disa.xml
@@ -3,7 +3,7 @@
 		<condition field="destination_number" expression="^\*(3472)$">
 			<action application="answer"/>
 			<action application="set" data="pin_number={v_pin_number}"/>
-			<action application="set" data="dialplan_context={v_context}"/>
+			<action application="set" data="dialplan_context=${context}"/>
 			<action application="lua" data="disa.lua"/>
 		</condition>
 	</extension>
diff --git a/app/dialplan/resources/xml/dialplan/999_local_extension.xml b/app/dialplan/resources/xml/dialplan/999_local_extension.xml
index 583e6f1232..2cef85e41e 100644
--- a/app/dialplan/resources/xml/dialplan/999_local_extension.xml
+++ b/app/dialplan/resources/xml/dialplan/999_local_extension.xml
@@ -10,8 +10,8 @@
 			<action application="bind_meta_app" data="2 ab s record_session::$${recordings_dir}/archive/${strftime(%Y)}/${strftime(%b)}/${strftime(%d)}/${uuid}.wav"/>
 			<action application="bind_meta_app" data="3 b s execute_extension::cf XML features"/>
 			<action application="bind_meta_app" data="4 b s execute_extension::att_xfer XML features"/>
-			<action application="set" data="ringback=${ringback}"/>
-			<action application="set" data="call_timeout=${call_timeout}"/>
+			<!--<action application="set" data="ringback=${ringback}"/>-->
+			<!--<action application="set" data="call_timeout=${call_timeout}"/>-->
 			<action application="set" data="hangup_after_bridge=true"/>
 			<!--<action application="set" data="continue_on_fail=NORMAL_TEMPORARY_FAILURE,USER_BUSY,NO_ANSWER,TIMEOUT,NO_ROUTE_DESTINATION"/> -->
 			<action application="set" data="continue_on_fail=true"/>