issue #2404: Compilation error fixes.