Fixed a few more content type issues.