Fixes for Boost 1.55