Feeder: Efficiency bugfixes