Fix EnvVars not getting through to Make runs