Improvements to the environment setup