Fixes in the common container abstraction