Fix things for compilation with VC9