more environment variable fixes