Fixes for Clang errors.