Minor tweaks, add an environment variable I need for now.