fix env vars with trailing spaces