Fixing clang compilation errors