container fixes