Add some workarounds for broken feeds