Fix WIN warnings [round No. 3]