Fix directory environment variable + echo run command