Tweaks to make clang happier