Container tweaks