Make watchers work correctly (by making 'late' work correctly)