Ongoing saga of container tweaks.