more fixes for clang