a few feeder fixes