Fixed last of NPC spawn errors