minor fixes for clang