Minor: watchdog small changes