[CLUCK][PVP] Fixes