Work on ContentType tweaks