Fix invalid references to FeedHandler