Fixes issues with VC++ 2010