Fix a few more place to reset the watchdog timer.