diff --git a/cmake/externals/wasapi/CMakeLists.txt b/cmake/externals/wasapi/CMakeLists.txt
index 7cfca4f3ba..b085eefb0c 100644
--- a/cmake/externals/wasapi/CMakeLists.txt
+++ b/cmake/externals/wasapi/CMakeLists.txt
@@ -6,8 +6,8 @@ if (WIN32)
   include(ExternalProject)
   ExternalProject_Add(
     ${EXTERNAL_NAME}
-    URL http://hifi-public.s3.amazonaws.com/dependencies/qtaudio_wasapi5.zip
-    URL_MD5 0530753e855ffc00232cc969bf1c84a8
+    URL http://hifi-public.s3.amazonaws.com/dependencies/qtaudio_wasapi6.zip
+    URL_MD5 fcac808c1ba0b0f5b44ea06e2612ebab
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
     INSTALL_COMMAND ""
diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
index 7f68738bd5..e4d4b222fe 100644
--- a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp
@@ -251,6 +251,8 @@ void RenderableWebEntityItem::setSourceUrl(const QString& value) {
     WebEntityItem::setSourceUrl(value);
 
     if (_sourceUrl != valueBeforeSuperclassSet && _webSurface) {
+        qCDebug(entities) << "Changing web entity source URL to " << _sourceUrl;
+
         AbstractViewStateInterface::instance()->postLambdaEvent([this] {
             _webSurface->getRootItem()->setProperty("url", _sourceUrl);
         });
diff --git a/libraries/entities/src/WebEntityItem.cpp b/libraries/entities/src/WebEntityItem.cpp
index 38ececefa4..5944b5ca3c 100644
--- a/libraries/entities/src/WebEntityItem.cpp
+++ b/libraries/entities/src/WebEntityItem.cpp
@@ -129,7 +129,6 @@ void WebEntityItem::setSourceUrl(const QString& value) {
 
         if (newURL.isValid()) {
             _sourceUrl = newURL.toDisplayString();
-            qCDebug(entities) << "Changed web entity source URL to " << _sourceUrl;
         } else {
             qCDebug(entities) << "Clearing web entity source URL since" << value << "cannot be parsed to a valid URL.";
         }
diff --git a/libraries/script-engine/src/ScriptAudioInjector.cpp b/libraries/script-engine/src/ScriptAudioInjector.cpp
index 2ec30ad4dd..c0ad2debd9 100644
--- a/libraries/script-engine/src/ScriptAudioInjector.cpp
+++ b/libraries/script-engine/src/ScriptAudioInjector.cpp
@@ -32,7 +32,7 @@ void injectorFromScriptValue(const QScriptValue& object, ScriptAudioInjector*& o
 ScriptAudioInjector::ScriptAudioInjector(AudioInjector* injector) :
     _injector(injector)
 {
-    
+    QObject::connect(injector, &AudioInjector::finished, this, &ScriptAudioInjector::finished);
 }
 
 ScriptAudioInjector::~ScriptAudioInjector() {
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index ad04c8b139..91e43ebb9a 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -1556,7 +1556,7 @@ var PropertiesTool = function (opts) {
                     Camera.cameraEntity = selectionManager.selections[0];
                 }
             } else if (data.action === "rescaleDimensions") {
-                var multiplier = data.percentage / 100;
+                var multiplier = data.percentage / 100.0;
                 if (selectionManager.hasSelection()) {
                     selectionManager.saveProperties();
                     for (i = 0; i < selectionManager.selections.length; i++) {
diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css
index 91138e41ec..251d0a2d75 100644
--- a/scripts/system/html/css/edit-style.css
+++ b/scripts/system/html/css/edit-style.css
@@ -593,7 +593,7 @@ hr {
 .dropdown dl {
     font-family: FiraSans-SemiBold;
     font-size: 15px;
-    width: 172px;
+    width: 292px;
     height: 28px;
     padding: 0 28px 0 12px;
     color: #afafaf;
@@ -645,7 +645,7 @@ hr {
 .dropdown li {
     list-style-type: none;
     padding: 3px 0 1px 12px;
-    width: 200px;
+    width: 320px;
     height: auto;
     font-family: FiraSans-SemiBold;
     font-size: 15px;
diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 1de59ad135..63131bb155 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -328,13 +328,13 @@
             <div class="model-group model-section zone-section property dropdown">
                 <label>Collision shape type</label>
                 <select name="SelectShapeType" id="property-shape-type">
-                    <option value="none">None</option>
+                    <option value="none">No Collision</option>
                     <option value="box">Box</option>
                     <option value="sphere">Sphere</option>
                     <option value="compound">Compound</option>
-                    <option value="simple-hull">One Hull</option>
-                    <option value="simple-compound">Hull Per Submesh</option>
-                    <option value="static-mesh">Static Mesh</option>
+                    <option value="simple-hull">Basic - Whole model</option>
+                    <option value="simple-compound">Good - Sub-meshes</option>
+                    <option value="static-mesh">Exact - All polygons (non-dynamic only)</option>
                 </select>
             </div>
             <div class="model-group model-section zone-section property url ">
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 4fe13196f3..3c155d83ea 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -1392,7 +1392,7 @@ function loaded() {
             EventBridge.emitWebEvent(JSON.stringify({
                 type: "action",
                 action: "rescaleDimensions",
-                percentage: parseInt(elRescaleDimensionsPct.value),
+                percentage: parseFloat(elRescaleDimensionsPct.value),
             }));
         });
         elReloadScriptButton.addEventListener("click", function() {