more win sdk build fixes