Fixes to make latest Clang happy