Fixed NPC saves and CMD