minor improvements to env vars definitions