Address clang always true warnings