More content handling changes.