Fix attack changing bugs