Fixes for doing multiple feeds in a single run.