Fix some clang compilation errors