More changes for container corruption.