diff --git a/BossHP/scripting/BossHP.sp b/BossHP/scripting/BossHP.sp
index eca5cb9c..a8749cac 100644
--- a/BossHP/scripting/BossHP.sp
+++ b/BossHP/scripting/BossHP.sp
@@ -369,7 +369,7 @@ public void OnEntitySpawned(int entity)
 		if(sTrigger[0] == '#')
 			iTriggerHammerID = StringToInt(sTrigger[1]);
 
-		if((iTriggerHammerID == -1 && sTargetname[0] && StrEqual(sTargetname, sTrigger)) || iTriggerHammerID == iHammerID)
+		if((iTriggerHammerID == -1 && sTrigger[0] && StrEqual(sTargetname, sTrigger)) || iTriggerHammerID == iHammerID)
 		{
 			char sOutput[64];
 			Config.GetOutput(sOutput, sizeof(sOutput));
@@ -632,7 +632,7 @@ void OnShowTrigger(int entity, const char[] output, SDKHookType HookType = view_
 		if(HookType != view_as<SDKHookType>(-1) && !Config.bMultiTrigger)
 		{
 			if(HookType == SDKHook_OnTakeDamagePost)
-				SDKUnhook(entity, SDKHook_OnTakeDamagePost, OnTakeDamagePost);
+				SDKUnhook(entity, SDKHook_OnTakeDamagePost, OnTakeDamagePostShow);
 		}
 
 		float fShowTriggerDelay = Config.fShowTriggerDelay;
@@ -711,7 +711,7 @@ void OnKillTrigger(int entity, const char[] output, SDKHookType HookType = view_
 		if(HookType != view_as<SDKHookType>(-1) && !Config.bMultiTrigger)
 		{
 			if(HookType == SDKHook_OnTakeDamagePost)
-				SDKUnhook(entity, SDKHook_OnTakeDamagePost, OnTakeDamagePost);
+				SDKUnhook(entity, SDKHook_OnTakeDamagePost, OnTakeDamagePostKill);
 		}
 
 		float fKillTriggerDelay = Config.fKillTriggerDelay;