Fixes related to switching content types.


git-svn-id: http://svn.cmsmadesimple.org/svn/cmsmadesimple@9510 3d254a34-79dc-0310-9e5f-be208747d8a0