further clang tweaks..