more clang fixes related to warnings converted to errors by -Werror