Stealth deactivation when Fire and minor fixes