Fix some bug from weird feeds