Updates for visual studio 2012/13