Fix build problems with clang