Update container changes in RC3

See #17 for detail, these changes work in a real app, but break the test suite.