Changes to packages and scripts, and add environment variables