Fix the containment problems.