Fix WIN warnings [round No. 2]