diff --git a/src/Data/Skills/spectre.lua b/src/Data/Skills/spectre.lua
index 43a93f1305..db754be6e5 100644
--- a/src/Data/Skills/spectre.lua
+++ b/src/Data/Skills/spectre.lua
@@ -6563,7 +6563,6 @@ skills["TBAbyssCarrionWingBeam"] = {
 			statDescriptionScope = "skill_stat_descriptions",
 			baseFlags = {
 				spell = true,
-				attack = true,
 				hit = true,
 				triggerable = true,
 			},
@@ -6721,7 +6720,6 @@ skills["TBVaalPyramidBeam"] = {
 			statDescriptionScope = "skill_stat_descriptions",
 			baseFlags = {
 				spell = true,
-				attack = true,
 				triggerable = true,
 			},
 			constantStats = {
@@ -7523,7 +7521,6 @@ skills["TBExcavatorSceptreErraticBeam"] = {
 			statDescriptionScope = "skill_stat_descriptions",
 			baseFlags = {
 				spell = true,
-				attack = true,
 				triggerable = true,
 				hit = true,
 			},
diff --git a/src/Export/Skills/spectre.txt b/src/Export/Skills/spectre.txt
index 66592f003e..7045c1d80b 100644
--- a/src/Export/Skills/spectre.txt
+++ b/src/Export/Skills/spectre.txt
@@ -1004,7 +1004,7 @@ statMap = {
 
 #skill TBAbyssCarrionWingBeam Beam
 #set TBAbyssCarrionWingBeam
-#flags spell attack hit triggerable
+#flags spell hit triggerable
 #mods
 #skillEnd
 
@@ -1028,7 +1028,7 @@ statMap = {
 
 #skill TBVaalPyramidBeam Pyramid Beam
 #set TBVaalPyramidBeam
-#flags spell attack triggerable
+#flags spell triggerable
 #mods
 #skillEnd
 
@@ -1143,7 +1143,7 @@ statMap = {
 
 #skill TBExcavatorSceptreErraticBeam Beam
 #set TBExcavatorSceptreErraticBeam
-#flags spell attack triggerable hit
+#flags spell triggerable hit
 #mods
 #skillEnd
 
diff --git a/src/Modules/CalcOffence.lua b/src/Modules/CalcOffence.lua
index a750c61c45..a8eec31594 100644
--- a/src/Modules/CalcOffence.lua
+++ b/src/Modules/CalcOffence.lua
@@ -2386,9 +2386,6 @@ function calcs.offence(env, actor, activeSkill)
 			-- Unarmed override for Concoction skills
 			if skillFlags.unarmed then
 				source = copyTable(data.unarmedWeaponData[env.classId])
-				if skillData.CritChance then
-					source.CritChance = skillData.CritChance
-				end
 			end
 			if source.FacebreakerItemDamage and activeSkill.activeEffect.grantedEffect.weaponTypes and activeSkill.activeEffect.grantedEffect.weaponTypes["One Hand Mace"] then
 				for _, damageType in ipairs(dmgTypeList) do
@@ -2399,6 +2396,9 @@ function calcs.offence(env, actor, activeSkill)
 			if critOverride and source.type and source.type ~= "None" then
 				source.CritChance = critOverride
 			end
+			if skillData.CritChance then
+				source.CritChance = skillData.CritChance
+			end
 			t_insert(passList, {
 				label = "Main Hand",
 				source = source,
@@ -2416,9 +2416,6 @@ function calcs.offence(env, actor, activeSkill)
 			-- Unarmed override for Concoction skills
 			if skillFlags.unarmed then
 				source = copyTable(data.unarmedWeaponData[env.classId])
-				if skillData.CritChance then
-					source.CritChance = skillData.CritChance
-				end
 			end
 			if critOverride and source.type and source.type ~= "None" then
 				source.CritChance = critOverride