Fix clang compilation errors