Some fixes on feed