Watchdog enhancements