Fixed env variable paths