Fixing environment variable silliness