More bug fixes for Watchdog