Corrections to avoid an Unit to die when it is already dead :o