Fixup on Watchdog mail