diff --git a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeUserRoleCmdMsgHdlr.scala b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeUserRoleCmdMsgHdlr.scala
index 980d3bf5c948b4de23a1897b8c3034987ec4d5fe..cb9cb11a52ca3fa52b9cf8c7bf5d163ea32b3d01 100755
--- a/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeUserRoleCmdMsgHdlr.scala
+++ b/akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/ChangeUserRoleCmdMsgHdlr.scala
@@ -28,7 +28,6 @@ trait ChangeUserRoleCmdMsgHdlr extends RightsManagementTrait {
         } yield {
           RegisteredUsers.updateUserRole(liveMeeting.registeredUsers, u, userRole)
         }
-        // Mconf's guest should always be fit for promotion
         val promoteGuest = !liveMeeting.props.usersProp.authenticatedGuest
         if (msg.body.role == Roles.MODERATOR_ROLE && (!uvo.guest || promoteGuest)) {
           // Promote non-guest users.
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
index 1b4e1a6afb930a4319c807a64cafe16504ccd7e1..71fa3725418d87f24e34e3c3ab6e7fbf44eb8b91 100755
--- a/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
+++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
@@ -372,7 +372,7 @@ public class Meeting {
 		return authenticatedGuest;
 	}
 
-  private String getUnauthenticatedGuestStatus(Boolean guest) {
+	private String getUnauthenticatedGuestStatus(Boolean guest) {
 		if (guest) {
 			switch(guestPolicy) {
 				case GuestPolicy.ALWAYS_ACCEPT:
@@ -391,7 +391,6 @@ public class Meeting {
 	}
 
 	public String calcGuestStatus(String role, Boolean guest, Boolean authned) {
-		// Good ol' Mconf guest status
 		if (!authenticatedGuest) return getUnauthenticatedGuestStatus(guest);
 
 		// Allow moderators all the time.
diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx
index 6027d1450fdc31fcd179b7f7791d1c0384c92b8c..ce9958dd1f8b290b576c5c348308a4a24bbd9a07 100755
--- a/bigbluebutton-html5/imports/ui/components/app/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/app/component.jsx
@@ -108,6 +108,7 @@ class App extends Component {
 
     this.handleWindowResize = throttle(this.handleWindowResize).bind(this);
     this.shouldAriaHide = this.shouldAriaHide.bind(this);
+    this.renderMedia = withDraggableContext(this.renderMedia.bind(this));
   }
 
   componentDidMount() {