Initial fixes for API and package.json