clean up a couple potential crash causing container-desynch issues with
items.