Ensure correct ownership in data-only containers.