Bug fixes due to barfeed refactoring.