Fixes in the common container abstraction
Merge pull request #61 from ryanjbaxter/container-fixes

Fixes in the common container abstraction