Smaller fixes while working with environment variables.