Some cleaning for Windows builds