Some fixup for taking items from containers

Some minor fixup for taking items from containers.