diff --git a/addons/zeus/functions/fnc_ui_toggleFlashlight.sqf b/addons/zeus/functions/fnc_ui_toggleFlashlight.sqf
index 74c0da150f..3085271dfa 100644
--- a/addons/zeus/functions/fnc_ui_toggleFlashlight.sqf
+++ b/addons/zeus/functions/fnc_ui_toggleFlashlight.sqf
@@ -36,7 +36,7 @@ private _fnc_errorAndClose = {
     params ["_msg"];
     _display closeDisplay 0;
     deleteVehicle _logic;
-    [_msg] call EFUNC(common,displayTextStructured);
+    [_msg] call FUNC(showMessage);
     breakOut "Main";
 };
 
@@ -106,6 +106,7 @@ private _fnc_onUnload = {
     private _logic = GETMVAR(BIS_fnc_initCuratorAttributes_target,objnull);
     if (isNull _logic) exitWith {};
 
+    deleteVehicle _logic;
 };
 
 private _fnc_onConfirm = {
diff --git a/addons/zeus/functions/fnc_ui_ToggleNvg.sqf b/addons/zeus/functions/fnc_ui_toggleNvg.sqf
similarity index 98%
rename from addons/zeus/functions/fnc_ui_ToggleNvg.sqf
rename to addons/zeus/functions/fnc_ui_toggleNvg.sqf
index 414c8f886a..10ed14aa0e 100644
--- a/addons/zeus/functions/fnc_ui_ToggleNvg.sqf
+++ b/addons/zeus/functions/fnc_ui_toggleNvg.sqf
@@ -36,7 +36,7 @@ private _fnc_errorAndClose = {
     params ["_msg"];
     _display closeDisplay 0;
     deleteVehicle _logic;
-    [_msg] call EFUNC(common,displayTextStructured);
+    [_msg] call FUNC(showMessage);
     breakOut "Main";
 };
 
@@ -97,6 +97,7 @@ private _fnc_onUnload = {
     private _logic = GETMVAR(BIS_fnc_initCuratorAttributes_target,objnull);
     if (isNull _logic) exitWith {};
 
+    deleteVehicle _logic;
 };
 
 private _fnc_onConfirm = {