More env changes