minor container related tweaks

d7c9bb4 r=alexcrichton
7ae17e0 r=huonw