Fixed a few more screwups in ContentType