Modify watchdog-related functions