Fixes for Clang and GCC builds.