Changes to the env setup