Windows build fixes, hopefully last part.