batch of container-related bugfixes