Minor changes for watchdog