Some arm item container fixes.