Fixed watchdog calls