Definition tweaks to allow building from Visual Studio 2012