Fixes for clang 3.5 and boost 1.56.