Fixes for clang.