Oops.  Fix environment overrides.