Feed bug fixes