BUG: Add patch for Batchmake windows compilation error (declaration of variable after beginning of block)