More handling of env vars with whitespaces