Address a couple of build script issues (windows related)