Fix last import errors. (watchdog might still fail.)