Updated solutions to vs2012