Fix a variety of container issues.