Fix feed errors

LGTM, same as other PR with changes.