More field manual npcID fixes