Container redux fixes

Fixes regressions introduced with the container redux — #4148 

![some-call-me-tim](https://cloud.githubusercontent.com/assets/85783/2947300/afeaf5b6-d9f4-11e3-8c34-633b10013651.gif)