Adapted some more containers to the new standards.