Fixes for new boost