Minor imrovements for content defs.