Small tweaks for Clang