diff --git a/dayz_code/actions/fill_startGenerator.sqf b/dayz_code/actions/fill_startGenerator.sqf
index 5b94b1d6f..3ceb68e96 100644
--- a/dayz_code/actions/fill_startGenerator.sqf
+++ b/dayz_code/actions/fill_startGenerator.sqf
@@ -52,11 +52,13 @@ if (_finished) then {
 
 		// Sound_Generator1
 		// Looks like this was the entended way of making the sound, lets test
-		_classname = "Sound_Generator1";
+		//_classname = "Sound_Generator1";
 
-		_location = (getPosATL _vehicle);
+		//_location = (getPosATL _vehicle);
 
-		_tmpbuilt = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"];
+		//_tmpbuilt = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"];
+
+		_soundSource = createSoundSource ["Generator1", position player, [], 0]
 
 		// TODO: Add running sounds to generator
 		cutText ["Generator has been started.", "PLAIN DOWN"];
diff --git a/dayz_code/compile/fn_selfActions.sqf b/dayz_code/compile/fn_selfActions.sqf
index 996621961..5a96cae8d 100644
--- a/dayz_code/compile/fn_selfActions.sqf
+++ b/dayz_code/compile/fn_selfActions.sqf
@@ -347,7 +347,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
 	};
 
 	//Start Generator
-	if(cursorTarget isKindOf "Generator_DZ" and _canDo and ("ItemJerrycan" in magazines player) and cursorTarget getVariable ["GeneratorRunning", 0] == 0) then {
+	if(cursorTarget isKindOf "Generator_DZ" and _canDo and ("ItemJerrycan" in magazines player) and (cursorTarget getVariable ["GeneratorRunning", false])) then {
 		if ((s_player_fillgen < 0) and (player distance cursorTarget < 3)) then {
 			s_player_fillgen = player addAction ["Fill and Start Generator", "\z\addons\dayz_code\actions\fill_startGenerator.sqf",cursorTarget, 0, false, true, "",""];
 		};
diff --git a/dayz_code/config.cpp b/dayz_code/config.cpp
index fd50a5ae4..b385ef929 100644
--- a/dayz_code/config.cpp
+++ b/dayz_code/config.cpp
@@ -20,7 +20,7 @@ class CfgPatches {
 		units[] = {};
 		weapons[] = {};
 		requiredVersion = 0.1;
-		requiredAddons[] = {"dayz_equip","dayz_weapons","CAMisc3","CABuildingParts","CABuildingParts_Signs","CAStructuresHouse","CAStructuresLand_Ind_Stack_Big","CAStructures_Misc_Powerlines","CAStructures","CABuildings","CABuildings2","Ind_MalyKomin","CAStructures_A_CraneCon","CAStructures_Mil","CAStructures_Nav","CAStructures_Rail","A_Crane_02","A_TVTower","CAStructures_Railway","CAStructuresHouse","CAStructuresHouse_HouseBT"};
+		requiredAddons[] = {"dayz_equip","dayz_weapons","dayz_sfx","CAMisc3","CABuildingParts","CABuildingParts_Signs","CAStructuresHouse","CAStructuresLand_Ind_Stack_Big","CAStructures_Misc_Powerlines","CAStructures","CABuildings","CABuildings2","Ind_MalyKomin","CAStructures_A_CraneCon","CAStructures_Mil","CAStructures_Nav","CAStructures_Rail","A_Crane_02","A_TVTower","CAStructures_Railway","CAStructuresHouse","CAStructuresHouse_HouseBT"};
 	};
 	class DZ_DebriefingRemoved
 	{