Fixed some compilation issues with VC2010