clang++ 5.0 fixes