Fix watched events to not depend on local system