Fixed references to removed interface INpc