fixes for clang