WP-2069 More small content type changes