EntityTracker NPC fixes, and a crash caused on NPC death related to Container