Simple fixes for env vars