Fix clang warnings not related to this PR