Corrected ENV handling in driver.