Fixes for Clang builds.