Fix for env vars