fix some more content descriptors (bug 1035346)