Upgrade solution to VS2013
Fix minor code issues