Watchdog fixes