Further miscellaneous changes to the Watchdog