diff --git a/index.html b/index.html
index ea1308f34..607434931 100644
--- a/index.html
+++ b/index.html
@@ -22,7 +22,7 @@
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
     <script src="interface_config.js?v=5"></script>
-    <script src="libs/app.bundle.js?v=110"></script>
+    <script src="libs/app.bundle.js?v=111"></script>
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
     <link rel="stylesheet" href="css/font.css?v=7"/>
     <link rel="stylesheet" href="css/toastr.css?v=1">
diff --git a/libs/app.bundle.js b/libs/app.bundle.js
index 0ab73cf9d..1051ebc0b 100644
--- a/libs/app.bundle.js
+++ b/libs/app.bundle.js
@@ -884,6 +884,10 @@ var RTC = {
         APP.xmpp.addListener(XMPPEvents.CALL_INCOMING, function(event) {
             DataChannels.init(event.peerconnection, eventEmitter);
         });
+        APP.UI.addListener(UIEvents.SELECTED_ENDPOINT,
+            DataChannels.handleSelectedEndpointEvent);
+        APP.UI.addListener(UIEvents.PINNED_ENDPOINT,
+            DataChannels.handlePinnedEndpointEvent);
 
         // In case of IE we continue from 'onReady' callback
         // passed to RTCUtils constructor. It will be invoked by Temasys plugin
@@ -3108,7 +3112,6 @@ var DesktopSharingEventTypes
     = require("../../service/desktopsharing/DesktopSharingEventTypes");
 var RTCEvents = require("../../service/RTC/RTCEvents");
 var RTCBrowserType = require("../RTC/RTCBrowserType");
-var DataChannels = require("../RTC/DataChannels");
 var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
 var UIEvents = require("../../service/UI/UIEvents");
@@ -3393,9 +3396,6 @@ function registerListeners() {
     APP.xmpp.addListener(XMPPEvents.CREATE_ANSWER_ERROR, function() {
         messageHandler.showError();
     });
-    APP.xmpp.addListener(XMPPEvents.CREATE_ANSWER_ERROR, function() {
-        messageHandler.showError();
-    });
     APP.xmpp.addListener(XMPPEvents.PROMPT_FOR_LOGIN, function() {
         // FIXME: re-use LoginDialog which supports retries
         UI.showLoginPopup(connect);
@@ -3426,10 +3426,6 @@ function registerListeners() {
     UI.addListener(UIEvents.NICKNAME_CHANGED, function (nickname) {
         APP.xmpp.addToPresence("displayName", nickname);
     });
-    UI.addListener(UIEvents.SELECTED_ENDPOINT,
-        DataChannels.handleSelectedEndpointEvent);
-    UI.addListener(UIEvents.PINNED_ENDPOINT,
-        DataChannels.handlePinnedEndpointEvent);
 }
 
 
@@ -4003,7 +3999,7 @@ UI.setVideoMute = setVideoMute;
 module.exports = UI;
 
 
-},{"../../service/RTC/RTCEvents":99,"../../service/RTC/StreamEventTypes":101,"../../service/UI/UIEvents":102,"../../service/connectionquality/CQEvents":104,"../../service/desktopsharing/DesktopSharingEventTypes":105,"../../service/members/Events":106,"../../service/xmpp/XMPPEvents":108,"../RTC/DataChannels":4,"../RTC/RTCBrowserType":8,"./../settings/Settings":47,"./audio_levels/AudioLevels.js":12,"./authentication/Authentication":14,"./avatar/Avatar":16,"./etherpad/Etherpad.js":17,"./prezi/Prezi.js":18,"./side_pannels/SidePanelToggler":20,"./side_pannels/chat/Chat.js":21,"./side_pannels/contactlist/ContactList":25,"./side_pannels/settings/SettingsMenu":26,"./toolbars/BottomToolbar":27,"./toolbars/Toolbar":28,"./toolbars/ToolbarToggler":29,"./util/MessageHandler":31,"./util/NicknameHandler":32,"./util/UIUtil":33,"./videolayout/VideoLayout.js":39,"./welcome_page/RoomnameGenerator":40,"./welcome_page/WelcomePage":41,"events":109}],12:[function(require,module,exports){
+},{"../../service/RTC/RTCEvents":99,"../../service/RTC/StreamEventTypes":101,"../../service/UI/UIEvents":102,"../../service/connectionquality/CQEvents":104,"../../service/desktopsharing/DesktopSharingEventTypes":105,"../../service/members/Events":106,"../../service/xmpp/XMPPEvents":108,"../RTC/RTCBrowserType":8,"./../settings/Settings":47,"./audio_levels/AudioLevels.js":12,"./authentication/Authentication":14,"./avatar/Avatar":16,"./etherpad/Etherpad.js":17,"./prezi/Prezi.js":18,"./side_pannels/SidePanelToggler":20,"./side_pannels/chat/Chat.js":21,"./side_pannels/contactlist/ContactList":25,"./side_pannels/settings/SettingsMenu":26,"./toolbars/BottomToolbar":27,"./toolbars/Toolbar":28,"./toolbars/ToolbarToggler":29,"./util/MessageHandler":31,"./util/NicknameHandler":32,"./util/UIUtil":33,"./videolayout/VideoLayout.js":39,"./welcome_page/RoomnameGenerator":40,"./welcome_page/WelcomePage":41,"events":109}],12:[function(require,module,exports){
 var CanvasUtil = require("./CanvasUtils");
 
 var ASDrawContext = $('#activeSpeakerAudioLevel')[0].getContext('2d');
@@ -17531,7 +17527,7 @@ module.exports = function(XMPP, eventEmitter)
                         var audioMuted = startMuted.attr("audio");
                         var videoMuted = startMuted.attr("video");
                         eventEmitter.emit(XMPPEvents.START_MUTED_FROM_FOCUS,
-                                startMuted.attr("audio") === "true", startMuted.attr("video") === "true");
+                                autioMuted === "true", videoMuted === "true");
                     }
                     sess = new JingleSession(
                         $(iq).attr('to'), $(iq).find('jingle').attr('sid'),
diff --git a/modules/RTC/RTC.js b/modules/RTC/RTC.js
index bd0a3870a..4c545d608 100644
--- a/modules/RTC/RTC.js
+++ b/modules/RTC/RTC.js
@@ -151,6 +151,10 @@ var RTC = {
         APP.xmpp.addListener(XMPPEvents.CALL_INCOMING, function(event) {
             DataChannels.init(event.peerconnection, eventEmitter);
         });
+        APP.UI.addListener(UIEvents.SELECTED_ENDPOINT,
+            DataChannels.handleSelectedEndpointEvent);
+        APP.UI.addListener(UIEvents.PINNED_ENDPOINT,
+            DataChannels.handlePinnedEndpointEvent);
 
         // In case of IE we continue from 'onReady' callback
         // passed to RTCUtils constructor. It will be invoked by Temasys plugin
diff --git a/modules/UI/UI.js b/modules/UI/UI.js
index 0f6a91dbb..655038afe 100644
--- a/modules/UI/UI.js
+++ b/modules/UI/UI.js
@@ -25,7 +25,6 @@ var DesktopSharingEventTypes
     = require("../../service/desktopsharing/DesktopSharingEventTypes");
 var RTCEvents = require("../../service/RTC/RTCEvents");
 var RTCBrowserType = require("../RTC/RTCBrowserType");
-var DataChannels = require("../RTC/DataChannels");
 var StreamEventTypes = require("../../service/RTC/StreamEventTypes");
 var XMPPEvents = require("../../service/xmpp/XMPPEvents");
 var UIEvents = require("../../service/UI/UIEvents");
@@ -310,9 +309,6 @@ function registerListeners() {
     APP.xmpp.addListener(XMPPEvents.CREATE_ANSWER_ERROR, function() {
         messageHandler.showError();
     });
-    APP.xmpp.addListener(XMPPEvents.CREATE_ANSWER_ERROR, function() {
-        messageHandler.showError();
-    });
     APP.xmpp.addListener(XMPPEvents.PROMPT_FOR_LOGIN, function() {
         // FIXME: re-use LoginDialog which supports retries
         UI.showLoginPopup(connect);
@@ -343,10 +339,6 @@ function registerListeners() {
     UI.addListener(UIEvents.NICKNAME_CHANGED, function (nickname) {
         APP.xmpp.addToPresence("displayName", nickname);
     });
-    UI.addListener(UIEvents.SELECTED_ENDPOINT,
-        DataChannels.handleSelectedEndpointEvent);
-    UI.addListener(UIEvents.PINNED_ENDPOINT,
-        DataChannels.handlePinnedEndpointEvent);
 }
 
 
diff --git a/modules/xmpp/strophe.jingle.js b/modules/xmpp/strophe.jingle.js
index 3ab5059a9..662f0faa8 100644
--- a/modules/xmpp/strophe.jingle.js
+++ b/modules/xmpp/strophe.jingle.js
@@ -120,7 +120,7 @@ module.exports = function(XMPP, eventEmitter)
                         var audioMuted = startMuted.attr("audio");
                         var videoMuted = startMuted.attr("video");
                         eventEmitter.emit(XMPPEvents.START_MUTED_FROM_FOCUS,
-                                startMuted.attr("audio") === "true", startMuted.attr("video") === "true");
+                                autioMuted === "true", videoMuted === "true");
                     }
                     sess = new JingleSession(
                         $(iq).attr('to'), $(iq).find('jingle').attr('sid'),