Minor changes for NPC's and other objects.