Fixing compilability under VS 2012