substrate: fix more variables and directories for windows