Added missing packages to package.json and tweaked build