Fix new env var based paths.