clang++ 3.5: fix compile errors