Updated for watchdog-iowait