Windows build updates