Watchdog changes