[Minor] Changes to the environment