Handle env vars better