Fix stopping of Watchdog service