newer clang/gcc compilation fixes