more werror fixes

Original commit message from CVS:
more werror fixes
5 files changed