Fix fallout from !156 and !176

Debarshi Ray requested to merge wip/rishi/base-item-trash-error-double-free into master Mar 14, 2021