Fixed npm issues