Minor changes to Watchdog code