fixes for environment variable support