Improve feed-handling.