bug 330236: fix warnings
17 files changed