Fixes for Clang/GCC builds.