Changes to ENV handling