issue #2378: Compilation error fixes.