Various package.json fixes