Fix bugs in VS2013 solution