Fix held-over environment variables from startup