minor container related tweaks