Fixed use of environment var in these files

Using environment var to find appropriate
directory.