Feeder: Lifecycle bugfixes