Stealth fixes