Minor adjustments to containers, etc