Make env vars work

Change-Id: I66b3db4fe8a8338a27e550071450b3d96643e3fd