fix merge issues, fix references to use dlls from VS2012 SDK