More ENV changes