Fix usage of environment variables for commands
2 files changed