Porting fixes for feed issues giving un-reliable counts.