Fixing leftover env vars with grouped envs