Watchdog improvements