get rid of more clang warnings