Changing how env vars are set