Improved env var handling