fix even more clang builds