diff --git a/cathook/src/hacks/ESP.cpp b/cathook/src/hacks/ESP.cpp
index e9d2e23f..13ce7975 100644
--- a/cathook/src/hacks/ESP.cpp
+++ b/cathook/src/hacks/ESP.cpp
@@ -157,6 +157,9 @@ void ESP::ProcessEntity(CachedEntity* ent) {
 
 	if (v_bEntityESP->GetBool()) {
 		ent->AddESPString(color, bgclr, "%s [%i]", ent->m_pEntity->GetClientClass()->m_pNetworkName, ent->m_iClassID);
+		if (v_bShowEntityID->GetBool()) {
+			ent->AddESPString(color, bgclr, "%i", ent->m_IDX);
+		}
 	}
 
 	switch (ent->m_iClassID) {
@@ -182,6 +185,7 @@ void ESP::ProcessEntity(CachedEntity* ent) {
 			if (!v_iShowPipes->GetBool()) break;
 			if (v_iShowPipes->GetInt() == 2 && !ent->m_bCritProjectile) break;
 			ent->AddESPString(color, bgclr, "[ (PP) ]");
+			break;
 		case 1:
 			if (!v_iShowStickies->GetBool()) break;
 			if (v_iShowStickies->GetInt() == 2 && !ent->m_bCritProjectile) break;
diff --git a/cathook/src/helpers.cpp b/cathook/src/helpers.cpp
index 866b7790..6486d5ef 100644
--- a/cathook/src/helpers.cpp
+++ b/cathook/src/helpers.cpp
@@ -469,12 +469,12 @@ bool IsProjectileCrit(IClientEntity* ent) {
 	case ClassID::CTFProjectile_Rocket:
 	case ClassID::CTFProjectile_SentryRocket:
 	case ClassID::CTFProjectile_EnergyBall:
-		return GetEntityValue<int>(ent, netvar.Rocket_bCritical);
+		return GetEntityValue<unsigned char>(ent, netvar.Rocket_bCritical);
 	case ClassID::CTFProjectile_Cleaver:
 	case ClassID::CTFProjectile_Jar:
 	case ClassID::CTFProjectile_JarMilk:
 	case ClassID::CTFGrenadePipebombProjectile:
-		return GetEntityValue<int>(ent, netvar.Grenade_bCritical);
+		return GetEntityValue<unsigned char>(ent, netvar.Grenade_bCritical);
 	}
 	return false;
 }