fixed clang issues