diff --git a/addons/fire/CfgSounds.hpp b/addons/fire/CfgSounds.hpp
index b83ce9b91a..76fb0e64f7 100644
--- a/addons/fire/CfgSounds.hpp
+++ b/addons/fire/CfgSounds.hpp
@@ -1,10 +1,10 @@
 // weird ass concatenation syntax. PBO Project complains otherwise...
 #define CONCAT(a,b) a####b
 #define CREATE_SCREAM(no)\
-class GVAR(DOUBLES(scream,no)) { \
-    name = QUOTE(GVAR(CONCAT(scream,no)));\
-    sound[] = {QUOTE(PATHTOF(CONCAT(sounds\scream,no).ogg)), QUOTE(db+8), 1};\
-    titles[] = {}; \
+class GVAR(DOUBLES(scream,no)) {\
+    name = QGVAR(CONCAT(scream,no));\
+    sound[] = {QPATHTOF(CONCAT(sounds\scream,no).ogg), QUOTE(db+8), 1};\
+    titles[] = {};\
 }
 
 class CfgSounds {
diff --git a/addons/fire/XEH_postInit.sqf b/addons/fire/XEH_postInit.sqf
index dfbe531b10..b093b1cdc5 100644
--- a/addons/fire/XEH_postInit.sqf
+++ b/addons/fire/XEH_postInit.sqf
@@ -59,7 +59,7 @@ if (isServer) then {
             private _hashedKey = hashValue _key;
 
             if (isNil "_hashedKey") exitWith {
-                ERROR_1("Unsupported key type used: %1",_key)
+                ERROR_3("Unsupported key type used: %1 - %2 - %3",_key,typeName _key,typeOf _key);
             };
 
             // To avoid issues, remove existing entries first before overwriting
@@ -76,7 +76,7 @@ if (isServer) then {
             private _hashedKey = hashValue _key;
 
             if (isNil "_hashedKey") exitWith {
-                ERROR_1("Unsupported key type used: %1",_key)
+                ERROR_3("Unsupported key type used: %1 - %2 - %3",_key,typeName _key,typeOf _key);
             };
 
             (GVAR(fireSources) deleteAt _hashedKey) params [["_fireLogic", objNull]];
diff --git a/addons/fire/functions/fnc_burnReaction.sqf b/addons/fire/functions/fnc_burnReaction.sqf
index 42bd64b43c..3138a31cc2 100644
--- a/addons/fire/functions/fnc_burnReaction.sqf
+++ b/addons/fire/functions/fnc_burnReaction.sqf
@@ -5,7 +5,6 @@
  *
  * Arguments:
  * 0: Unit <OBJECT>
- * 1: Should unit throw its current weapon <BOOL> (default: true)
  *
  * Return Value:
  * None
@@ -13,20 +12,14 @@
  * Public: No
  */
 
-params ["_unit", ["_throwWeapon", true]];
+params ["_unit"];
 
 if (
-    _throwWeapon
-    && {GVAR(dropWeapon) > 0}
-    && {isNull objectParent _unit && {(currentWeapon _unit) != ""}}
-    && {!isPlayer _unit || GVAR(dropWeapon) >= 2}
+    GVAR(dropWeapon) > 0 &&
+    {isNull objectParent _unit && {(currentWeapon _unit) != ""}} &&
+    {!isPlayer _unit || GVAR(dropWeapon) >= 2}
 ) then {
     _unit call EFUNC(common,throwWeapon);
 };
 
-if (_unit isKindOf "CAManBase") then {
-    private _soundID = floor (1 + random 15);
-    private _sound = format [QGVAR(scream_%1), _soundID];
-
-    [QGVAR(playScream), [_sound, _unit]] call CBA_fnc_globalEvent;
-};
+[QGVAR(playScream), [format [QGVAR(scream_%1), floor (1 + random 15)], _unit]] call CBA_fnc_globalEvent;
diff --git a/addons/fire/functions/fnc_medical_success.sqf b/addons/fire/functions/fnc_medical_success.sqf
index 5538d7d4db..a84aab5644 100644
--- a/addons/fire/functions/fnc_medical_success.sqf
+++ b/addons/fire/functions/fnc_medical_success.sqf
@@ -29,7 +29,7 @@ if (_intensity > BURN_MIN_INTENSITY) then {
     TRACE_1("patient still burning, looping",_this);
 
     if (EGVAR(medical_gui,pendingReopen)) then {
-        LOG("temporarily blocking medical menu reopen");
+        TRACE_1("temporarily blocking medical menu reopen",_this);
 
         EGVAR(medical_gui,pendingReopen) = false;
         [{EGVAR(medical_gui,pendingReopen) = true}] call CBA_fnc_execNextFrame;