diff --git a/bbb-lti/lti.nginx b/bbb-lti/lti.nginx
index 747d2a46be..afe416e71e 100644
--- a/bbb-lti/lti.nginx
+++ b/bbb-lti/lti.nginx
@@ -4,7 +4,7 @@
            proxy_pass         http://127.0.0.1:8080;
            proxy_redirect     default;
            proxy_set_header   X-Forwarded-For   $proxy_add_x_forwarded_for;
-           proxy_set_header   X-Forwarded-Proto $http_x_forwarded_proto;
+           proxy_set_header   X-Forwarded-Proto $scheme;
 
            # Allow 30M uploaded presentation document.
            client_max_body_size       30m;
diff --git a/bigbluebutton-client/resources/config.xml.template b/bigbluebutton-client/resources/config.xml.template
index fe508d91e7..8b505b3922 100755
--- a/bigbluebutton-client/resources/config.xml.template
+++ b/bigbluebutton-client/resources/config.xml.template
@@ -47,7 +47,7 @@
 			uri="rtmp://HOST/screenshare"
 			showButton="true"
 			baseTabIndex="201"
-			useWebRTCIfAvailable="false"
+			tryWebRTCFirst="false"
 			chromeExtensionKey=""
 			help="http://HOST/client/help/screenshare-help.html"
 		/>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
index 4c3ded284d..de6bd81eb4 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
@@ -150,7 +150,7 @@ package org.bigbluebutton.modules.screenshare.managers {
             var option:ScreenshareOptions = new ScreenshareOptions();
             option.parseOptions();
 
-            if (option.useWebRTCIfAvailable && !BrowserCheck.isWebRTCSupported()) {
+            if (option.tryWebRTCFirst && !BrowserCheck.isWebRTCSupported()) {
               usingJava = true;
               publishWindowManager.startSharing(module.getCaptureServerUri(), module.getRoom());
               sharing = true;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
index fb5b908645..d9985d8364 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
@@ -169,7 +169,7 @@ package org.bigbluebutton.modules.screenshare.managers
 			var options:ScreenshareOptions = new ScreenshareOptions();
 			options.parseOptions();
 
-			if (options.useWebRTCIfAvailable && BrowserCheck.isWebRTCSupported()) {
+			if (options.tryWebRTCFirst && BrowserCheck.isWebRTCSupported()) {
 				JSLog.warn("WebRTCDeskshareManager::handleStartSharingEvent WebRTC Supported", {});
 				if (BrowserCheck.isFirefox()) {
 					onSuccess("Firefox, lets try");
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
index 6a68278634..5e3aeb6b82 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
@@ -24,7 +24,7 @@ package org.bigbluebutton.modules.screenshare.model
 	{
 		[Bindable] public var showButton:Boolean = true;
 		[Bindable] public var baseTabIndex:int;
-		[Bindable] public var useWebRTCIfAvailable:Boolean = false;
+		[Bindable] public var tryWebRTCFirst:Boolean = false;
 		[Bindable] public var chromeExtensionKey:String = null;
     [Bindable] public var helpUrl:String;
 
@@ -40,8 +40,8 @@ package org.bigbluebutton.modules.screenshare.model
 				if (vxml.@showButton != undefined){
 					showButton = (vxml.@showButton.toString().toUpperCase() == "TRUE") ? true : false;
 				}
-				if (vxml.@useWebRTCIfAvailable != undefined) {
-					useWebRTCIfAvailable = (vxml.@useWebRTCIfAvailable.toString().toUpperCase() == "TRUE") ? true : false;
+				if (vxml.@tryWebRTCFirst != undefined) {
+					tryWebRTCFirst = (vxml.@tryWebRTCFirst.toString().toUpperCase() == "TRUE") ? true : false;
 				}
 				if (vxml.@chromeExtensionKey != undefined) {
 					chromeExtensionKey = vxml.@chromeExtensionKey.toString();
diff --git a/bigbluebutton-config/bin/bbb-record b/bigbluebutton-config/bin/bbb-record
index fe3870f569..c472c9a4d8 100755
--- a/bigbluebutton-config/bin/bbb-record
+++ b/bigbluebutton-config/bin/bbb-record
@@ -602,8 +602,9 @@ fi
 done
 	echo
 	echo "--"
-	ps fU $SERVLET_CONTAINER -o "%c%a" | grep -v COMMAND | grep -v logging.properties
-
+	systemctl --all --no-pager list-timers bbb-record-core.timer
+	echo "--"
+	systemctl --no-pager status bbb-record-core.service
 	echo "--"
 
 	if tail -n 20 /var/log/bigbluebutton/bbb-web.log | grep -q "is recorded. Process it."; then