Some fixes for containers.