Updated watchdog() calls