Fixing expansion of environment variables for path addition