Windows builds fixes