Remove more VC++ warnings