Bug 4576: fix warning and compile
4 files changed