Make changes related to VC11 in 32-bit