Clang compilation fixes.