Fixed up a few content issues