[watchdog] improved build;