More container tweaks.