Fixing up environ lookup