Final fixes on NPC and Item lockout code