Tweaks for updated clang