Add Windows support for new bootstrap