Fixed NPC classes