Changes for VS 2013