More environment related updates