WP-2899 Small changes to the watchdog calls