Updated some NPCs, ref #1241