Add the missing files.
Add the expansion of the env var inside the arithmetic expression.