updates for better watchdog support.