some minor env variable fixes