Fixes for pending feed links (take 3)