Watchdog and emailer small fixes