Fix watchdog calls