boost-1.54.0 fixes