Fix junk content issues