Fixes for duplicate feeds