Fixes for env vars on Ubuntu