Superbuild fixes for Windows

-------
Fixes used on my Windows checkout.

Cc @judajake