Fix package.json deps & fix Makefile