OnTakeDamage Fix and others