Fixed npm install and build isues