diff --git a/bigbluebutton-html5/imports/api/phone/PhoneService.js b/bigbluebutton-html5/imports/api/phone/PhoneService.js
index e9cb1cb721..f16b63eba8 100755
--- a/bigbluebutton-html5/imports/api/phone/PhoneService.js
+++ b/bigbluebutton-html5/imports/api/phone/PhoneService.js
@@ -43,6 +43,21 @@
 //   };
 // }
 
+BBB = {};
+BBB.getMyUserInfo = function (callback) {
+  let result = {
+    myUserID: 'getMyUserID',
+    myUsername: 'getMyUserName',
+    myInternalUserID: 'BBB.getMyUserID',
+    myAvatarURL: null,
+    myRole: 'getMyRole',
+    amIPresenter: 'amIPresenter',
+    voiceBridge: '70506',
+    dialNumber: null,
+  };
+  return callback(result);
+};
+
 // join the conference. If listen only send the request to the server
 function joinVoiceCall(options) {
   console.log(options);
@@ -53,8 +68,8 @@ function joinVoiceCall(options) {
     };
 
     if (options.isListenOnly) {
-      Meteor.call('listenOnlyRequestToggle', getInSession('meetingId'), getInSession('userId'),
-        getInSession('authToken'), true);
+      // Meteor.call('listenOnlyRequestToggle', getInSession('meetingId'), getInSession('userId'),
+        // getInSession('authToken'), true);
     }
 
     const requestedListenOnly = options.isListenOnly;
diff --git a/bigbluebutton-html5/imports/api/polls/polls.js b/bigbluebutton-html5/imports/api/polls/polls.js
index 802f315714..2baf0fd7f4 100755
--- a/bigbluebutton-html5/imports/api/polls/polls.js
+++ b/bigbluebutton-html5/imports/api/polls/polls.js
@@ -1,3 +1,3 @@
 import {Mongo} from 'meteor/mongo';
 
-export const Polls = new Mongo.Collection('polls');
+export default new Mongo.Collection('polls');
diff --git a/bigbluebutton-html5/imports/ui/components/app/AppContainer.jsx b/bigbluebutton-html5/imports/ui/components/app/AppContainer.jsx
index 83e24a2984..169a002541 100755
--- a/bigbluebutton-html5/imports/ui/components/app/AppContainer.jsx
+++ b/bigbluebutton-html5/imports/ui/components/app/AppContainer.jsx
@@ -2,7 +2,7 @@ import React, { Component, PropTypes } from 'react';
 import { createContainer } from 'meteor/react-meteor-data';
 
 import App from './App.jsx';
-import AppService from './AppService';
+import {pollExists} from './AppService';
 
 import NavBarContainer from '../nav-bar/NavBarContainer.jsx';
 import ActionsBarContainer from '../actions-bar/ActionsBarContainer.jsx';
@@ -34,7 +34,7 @@ class AppContainer extends Component {
 AppContainer.defaultProps = defaultProps;
 
 const actionControlsToShow = () => {
-  if (AppService.pollExists) {
+  if (pollExists()) {
     return <PollingContainer />;
   } else {
     return <ActionsBarContainer />;
diff --git a/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx b/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
index f1c091739f..06a672eb9c 100755
--- a/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
+++ b/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
@@ -3,7 +3,7 @@ import Modal from 'react-modal';
 import {Icon} from '/imports/ui/components/shared/Icon.jsx';
 import {Button} from '/imports/ui/components/shared/Button.jsx';
 import BaseMenu from './BaseMenu.jsx';
-import {joinVoiceCall} from '/imports/api/phone/PhoneService.js';
+import {joinVoiceCall} from '/imports/api/phone/PhoneService';
 
 export default class AudioMenu extends BaseMenu {
   constructor(props) {