Improve feeder shutdown