More feed fixes