upgrade to VS 2012, small fixes