Watchdog updates

by