Fixes for old boost and old gcc