Fix up the Windows build