VS2013 and Boost 1.54 fixes