More tweaks for feed validation.