Updates to compile under VS2012