Fixed build issues (boost issues #7979 and #8971)